Author: bentmann
Date: Wed Oct 1 14:22:36 2008
New Revision: 700933
URL: http://svn.apache.org/viewvc?rev=700933&view=rev
Log:
o Decoupled it0047 from production dependency
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/src/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java?rev=700933&r1=700932&r2=700933&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java
Wed Oct 1 14:22:36 2008
@@ -21,8 +21,11 @@
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.util.StringUtils;
import java.io.File;
+import java.util.List;
+import java.util.Properties;
public class MavenIT0047Test
extends AbstractMavenIntegrationTestCase
@@ -37,11 +40,18 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0047" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "compile" );
- verifier.assertFilePresent(
"target/classes/org/apache/maven/it0047/Person.class" );
+ Properties systemProperties = new Properties();
+ systemProperties.put( "depres.compileClassPath", new File( testDir,
"target/compile.txt" ).getAbsolutePath() );
+ verifier.setSystemProperties( systemProperties );
+ verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" );
+ verifier.assertFilePresent( "target/compile.txt" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ List lines = verifier.loadLines( "target/compile.txt", "UTF-8" );
+ String paths = StringUtils.join( lines.iterator(), "\t" ).replace(
'\\', '/' );
+ assertTrue( paths.indexOf(
"org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar" ) >= 0 );
+ assertTrue( paths.indexOf(
"org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar" ) >= 0
);
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/pom.xml?rev=700933&r1=700932&r2=700933&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/pom.xml
Wed Oct 1 14:22:36 2008
@@ -1,16 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0047</name>
+
<groupId>org.apache.maven.its.it0047</groupId>
<artifactId>maven-it-it0047</artifactId>
- <description>Test the use case for having a compile time dependency be
transitive:
- when you extend a class you need its dependencies at compile
time.</description>
<version>1.0</version>
+
+ <name>Maven Integration Test :: it0047</name>
+ <description>
+ Test the use case for having a compile time dependency be transitive:
+ when you extend a class you need its dependencies at compile time.
+ </description>
+
<dependencies>
+ <!-- should bring in transitive-dep, too -->
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-7</version>
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>direct-dep</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar?rev=700933&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom?rev=700933&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/1.0/direct-dep-1.0.pom
Wed Oct 1 14:22:36 2008
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>direct-dep</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <!-- compile-scoped dependencies should be transitive for the sake of
class inheritance -->
+ <dependency>
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>transitive-dep</artifactId>
+ <version>1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml?rev=700933&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
Wed Oct 1 14:22:36 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>direct-dep</artifactId>
+ <version>1.0</version>
+ <versioning>
+ <versions>
+ <version>1.0</version>
+ </versions>
+ <lastUpdated>20081001201944</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/direct-dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar?rev=700933&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom?rev=700933&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/1.1/transitive-dep-1.1.pom
Wed Oct 1 14:22:36 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>transitive-dep</artifactId>
+ <version>1.1</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml?rev=700933&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
Wed Oct 1 14:22:36 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0047</groupId>
+ <artifactId>transitive-dep</artifactId>
+ <version>1.1</version>
+ <versioning>
+ <versions>
+ <version>1.1</version>
+ </versions>
+ <lastUpdated>20081001201930</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0047/repo/org/apache/maven/its/it0047/transitive-dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
