diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java index bc5ce9d708..e01ca8dcf7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java @@ -23,6 +23,7 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.Collection; /** * This is a test set for MNG-505. @@ -35,21 +36,27 @@ public class MavenITmng0505VersionRangeTest { /** - * Test version range junit [3.7,) resolves to 3.8.1 + * Test version range support. */ public void testitMNG505() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0505" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.4", "jar" ); - verifier.deleteArtifact( "junit", "junit", "3.8", "jar" ); - verifier.executeGoal( "package" ); - verifier.assertArtifactPresent( "junit", "junit", "3.8", "jar" ); - verifier.assertArtifactPresent( "org.apache.maven", "maven-core-it-support", "1.4", "jar" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng0505" ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); + Collection artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); + assertEquals( 4, artifacts.size() ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0505:a:jar:1.1" ) ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0505:b:jar:1.0" ) ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0505:c:jar:3.8" ) ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0505:d:jar:2.1.1" ) ); } -} +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java index 2e98f23140..321a7908f3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java @@ -23,6 +23,7 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; +import java.util.Collection; /** * This is a test set for MNG-820. @@ -41,31 +42,21 @@ public class MavenITmng0820ConflictResolutionTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0820" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "package" ); - verifier.assertFilePresent( "test-component-a/target/test-component-a-0.1.jar" ); - verifier.assertFilePresent( "test-component-b/target/test-component-b-0.1.jar" ); - verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1.war" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-a-0.1.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/maven-core-it-support-1.4.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/commons-io-1.0.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar" ); - verifier.assertFilePresent( - "test-component-c/target/test-component-c-0.1/WEB-INF/lib/maven-core-it-support-1.4.jar" ); - verifier.assertFilePresent( "test-component-c/target/test-component-c-0.1/WEB-INF/lib/commons-io-1.0.jar" ); - verifier.assertFileNotPresent( - "test-component-c/target/test-component-c-0.1/WEB-INF/lib/commons-lang-1.0.jar" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng0820" ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); + Collection artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); + assertEquals( 3, artifacts.size() ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0820:d:jar:2.0" ) ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0820:c:jar:1.4" ) ); + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0820:a:jar:1.0" ) ); + assertFalse( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng0505:b:jar:1.0" ) ); } -} +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java index e13a638849..311ad51054 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java @@ -43,16 +43,16 @@ public class MavenITmng0823MojoContextPassingTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0823" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.plugins", "maven-it-plugin-context-passing", "1.0", - "maven-plugin" ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); List goals = Arrays.asList( new String[]{"org.apache.maven.its.plugins:maven-it-plugin-context-passing:throw", "org.apache.maven.its.plugins:maven-it-plugin-context-passing:catch"} ); verifier.executeGoals( goals ); verifier.assertFilePresent( "target/thrown-value" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - } -} +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java index 653e46568e..180160a173 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java @@ -44,6 +44,8 @@ public class MavenITmng0985NonExecutedPluginMngtGoalsTest { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-0985" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); verifier.executeGoal( "initialize" ); verifier.assertFileNotPresent( "target/unexpected.txt" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java index 15616ccb0b..5e7cd0ceb8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java @@ -44,6 +44,8 @@ public class MavenITmng1052PluginMngtConfigTest { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1052" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); verifier.executeGoal( "process-resources" ); verifier.assertFilePresent( "target/plugin-management.txt" ); verifier.assertFileNotPresent( "target/resources-resources.txt" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java index 737270df0e..96c4091660 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java @@ -55,8 +55,7 @@ public class MavenITmng1323AntrunDependenciesTest verifier.deleteDirectory( "a/target" ); verifier.deleteDirectory( "b/target" ); verifier.deleteDirectory( "c/target" ); - verifier.deleteArtifact( "org.apache.maven.its.mng1323", "dep-a", "0.1", "jar" ); - verifier.deleteArtifact( "org.apache.maven.its.mng1323", "dep-b", "0.1", "jar" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng1323" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java index 2e158401a0..7f89b5c91e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1412DependenciesOrderTest.java @@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -import java.util.ArrayList; import java.util.List; /** @@ -35,6 +34,7 @@ import java.util.List; public class MavenITmng1412DependenciesOrderTest extends AbstractMavenIntegrationTestCase { + public MavenITmng1412DependenciesOrderTest() { super( "(2.0.8,)" ); // 2.0.9+ @@ -43,20 +43,51 @@ public class MavenITmng1412DependenciesOrderTest public void testitMNG1412() throws Exception { - // The testdir is computed from the location of this file. File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1412" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-X" ); - - verifier.setCliOptions( cliOptions ); - - verifier.executeGoal( "test" ); - + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng1412" ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); - verifier.resetStreams(); + + List compileArtifacts = verifier.loadLines( "target/compile-artifacts.txt", "UTF-8" ); + assertArtifactOrder( compileArtifacts ); + + List compileClassPath = verifier.loadLines( "target/compile-classpath.txt", "UTF-8" ); + assertClassPathOrder( compileClassPath.subList( 1, compileClassPath.size() ) ); + + List runtimeArtifacts = verifier.loadLines( "target/runtime-artifacts.txt", "UTF-8" ); + assertArtifactOrder( runtimeArtifacts ); + + List runtimeClassPath = verifier.loadLines( "target/runtime-classpath.txt", "UTF-8" ); + assertClassPathOrder( runtimeClassPath.subList( 1, runtimeClassPath.size() ) ); + + List testArtifacts = verifier.loadLines( "target/test-artifacts.txt", "UTF-8" ); + assertArtifactOrder( testArtifacts ); + + List testClassPath = verifier.loadLines( "target/test-classpath.txt", "UTF-8" ); + assertClassPathOrder( testClassPath.subList( 2, testClassPath.size() ) ); } + + private void assertArtifactOrder( List artifacts ) + { + assertEquals( 4, artifacts.size() ); + assertEquals( "org.apache.maven.its.mng1412:a:jar:0.1", artifacts.get( 0 ) ); + assertEquals( "org.apache.maven.its.mng1412:c:jar:0.1", artifacts.get( 1 ) ); + assertEquals( "org.apache.maven.its.mng1412:b:jar:0.1", artifacts.get( 2 ) ); + assertEquals( "org.apache.maven.its.mng1412:d:jar:0.1", artifacts.get( 3 ) ); + } + + private void assertClassPathOrder( List classpath ) + { + assertEquals( 4, classpath.size() ); + assertEquals( "a-0.1.jar", classpath.get( 0 ) ); + assertEquals( "c-0.1.jar", classpath.get( 1 ) ); + assertEquals( "b-0.1.jar", classpath.get( 2 ) ); + assertEquals( "d-0.1.jar", classpath.get( 3 ) ); + } + } diff --git a/its/core-it-suite/src/test/resources/mng-0505/pom.xml b/its/core-it-suite/src/test/resources/mng-0505/pom.xml index 6bc8cdbb74..8c5a05271c 100644 --- a/its/core-it-suite/src/test/resources/mng-0505/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0505/pom.xml @@ -1,22 +1,94 @@ + + + + 4.0.0 - Maven Integration Test :: it0034 - org.apache.maven.its.it0034 - maven-it-it0034 - Test version range junit [3.7,) resolves to 3.8.1 + + org.apache.maven.its.mng0505 + test 1.0 + + Maven Integration Test :: MNG-505 + + Test version range support. + + + + + central + file:///${basedir}/repo + + ignore + + + false + + + + - junit - junit - - (,3.8.1) - test + org.apache.maven.its.mng0505 + a + + [1.1,) - org.apache.maven - maven-core-it-support - [1.0,) + org.apache.maven.its.mng0505 + b + + (,1.0] + + + org.apache.maven.its.mng0505 + c + + (,3.8.1) + + + org.apache.maven.its.mng0505 + d + + (,2.1),(2.1,) + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/artifacts.txt + + + + validate + + compile + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.jar new file mode 100644 index 0000000000..09e1e87b70 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.pom new file mode 100644 index 0000000000..0b5dcdd821 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.0/a-1.0.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + a + 1.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.jar new file mode 100644 index 0000000000..a181e9e881 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.pom new file mode 100644 index 0000000000..0e24b4acb3 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/1.1/a-1.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + a + 1.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/maven-metadata.xml new file mode 100644 index 0000000000..afa48239f0 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/a/maven-metadata.xml @@ -0,0 +1,13 @@ + + org.apache.maven.its.mng0505 + a + 1.0 + + 1.1 + + 1.0 + 1.1 + + 20090201153111 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.jar new file mode 100644 index 0000000000..2eb36a67b5 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.pom new file mode 100644 index 0000000000..7d83e21380 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.0/b-1.0.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + b + 1.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.jar new file mode 100644 index 0000000000..0aeb5a9797 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.pom new file mode 100644 index 0000000000..68a1422d08 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/1.1/b-1.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + b + 1.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/maven-metadata.xml new file mode 100644 index 0000000000..a563282b5a --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/b/maven-metadata.xml @@ -0,0 +1,13 @@ + + org.apache.maven.its.mng0505 + b + 1.0 + + 1.1 + + 1.0 + 1.1 + + 20090201153127 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.jar new file mode 100644 index 0000000000..e81b728c9e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.pom new file mode 100644 index 0000000000..b270a2eb2c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.7/c-3.7.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + c + 3.7 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.jar new file mode 100644 index 0000000000..32b813d9d8 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.pom new file mode 100644 index 0000000000..2766716672 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8.1/c-3.8.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + c + 3.8.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.jar new file mode 100644 index 0000000000..8b92a3899a Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.pom new file mode 100644 index 0000000000..480ffa0509 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/3.8/c-3.8.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + c + 3.8 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/maven-metadata.xml new file mode 100644 index 0000000000..4dde410527 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/c/maven-metadata.xml @@ -0,0 +1,14 @@ + + org.apache.maven.its.mng0505 + c + 3.7 + + 3.8.1 + + 3.7 + 3.8 + 3.8.1 + + 20090201153156 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.jar new file mode 100644 index 0000000000..81b1aa79c1 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.pom new file mode 100644 index 0000000000..fbc0683052 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.0/d-2.0.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + d + 2.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.jar new file mode 100644 index 0000000000..c2f2f43fed Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.pom new file mode 100644 index 0000000000..2f617df30f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1.1/d-2.1.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + d + 2.1.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.jar b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.jar new file mode 100644 index 0000000000..c84f87e1ed Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.pom b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.pom new file mode 100644 index 0000000000..ccabe3037f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/2.1/d-2.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0505 + d + 2.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/maven-metadata.xml new file mode 100644 index 0000000000..4d4984cbd0 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0505/repo/org/apache/maven/its/mng0505/d/maven-metadata.xml @@ -0,0 +1,14 @@ + + org.apache.maven.its.mng0505 + d + 2.0 + + 2.1.1 + + 2.0 + 2.1 + 2.1.1 + + 20090201153244 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0820/pom.xml b/its/core-it-suite/src/test/resources/mng-0820/pom.xml index 1b9a5b3975..58be86704e 100644 --- a/its/core-it-suite/src/test/resources/mng-0820/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0820/pom.xml @@ -1,14 +1,94 @@ + + + + 4.0.0 - Maven Integration Test :: it0084 - org.apache.maven.its.it0084 - maven-it-it0084 - Verify that the collector selecting a particular version gets the correct subtree + + org.apache.maven.its.mng0820 + test 0.1 pom - - test-component-c - test-component-b - test-component-a - + + Maven Integration Test :: MNG-820 + + Verify that the collector selecting a particular version gets the correct subtree. + + + + + maven-core-it + file:///${basedir}/repo + + ignore + + + false + + + + + + + + org.apache.maven.its.mng0820 + d + 2.0 + + + org.apache.maven.its.mng0820 + c + 1.4 + + + + + + + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/artifacts.txt + + + + validate + + runtime + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.jar b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.jar new file mode 100644 index 0000000000..a7ff3b5e62 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.pom b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.pom new file mode 100644 index 0000000000..8a81340499 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/1.0/a-1.0.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0820 + a + 1.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/maven-metadata.xml new file mode 100644 index 0000000000..b09450a148 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/a/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng0820 + a + 1.0 + + 1.0 + + 1.0 + + 20090201194850 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.jar b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.jar new file mode 100644 index 0000000000..c5b2515186 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.pom b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.pom new file mode 100644 index 0000000000..798da8cdfa --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/1.0/b-1.0.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0820 + b + 1.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/maven-metadata.xml new file mode 100644 index 0000000000..ff80eeb686 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/b/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng0820 + b + 1.0 + + 1.0 + + 1.0 + + 20090201194900 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.jar b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.jar new file mode 100644 index 0000000000..0c362fcfec Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.pom b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.pom new file mode 100644 index 0000000000..3cf64471d8 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.3/c-1.3.pom @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0820 + c + 1.3 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven.its.mng0820 + b + 1.0 + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.jar b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.jar new file mode 100644 index 0000000000..206b5f8781 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.pom b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.pom new file mode 100644 index 0000000000..a9bd78f014 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/1.4/c-1.4.pom @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0820 + c + 1.4 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven.its.mng0820 + a + 1.0 + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/maven-metadata.xml new file mode 100644 index 0000000000..8f25d5da5a --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/c/maven-metadata.xml @@ -0,0 +1,13 @@ + + org.apache.maven.its.mng0820 + c + 1.3 + + 1.4 + + 1.3 + 1.4 + + 20090201195111 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.jar b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.jar new file mode 100644 index 0000000000..fa8c3e8836 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.pom b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.pom new file mode 100644 index 0000000000..f19de33aaf --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/2.0/d-2.0.pom @@ -0,0 +1,48 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng0820 + d + 2.0 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.apache.maven.its.mng0820 + c + 1.3 + + + diff --git a/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/maven-metadata.xml new file mode 100644 index 0000000000..fe6d05bbee --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-0820/repo/org/apache/maven/its/mng0820/d/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng0820 + d + 2.0 + + 2.0 + + 2.0 + + 20090201195332 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-a/pom.xml b/its/core-it-suite/src/test/resources/mng-0820/test-component-a/pom.xml deleted file mode 100644 index 220be64332..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-a/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 - - test-component-a - 0.1 - Test Component A - jar - - - org.apache.maven - maven-core-it-support - 1.4 - - - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-a/src/main/java/A.java b/its/core-it-suite/src/test/resources/mng-0820/test-component-a/src/main/java/A.java deleted file mode 100644 index 40b4ff4588..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-a/src/main/java/A.java +++ /dev/null @@ -1,5 +0,0 @@ -package it0084; - -public class A { -} - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-b/pom.xml b/its/core-it-suite/src/test/resources/mng-0820/test-component-b/pom.xml deleted file mode 100644 index 350ebc4aa8..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-b/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 - - test-component-b - 0.1 - Test Component B - jar - - - org.apache.maven - maven-core-it-support - 1.3 - - - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-b/src/main/java/B.java b/its/core-it-suite/src/test/resources/mng-0820/test-component-b/src/main/java/B.java deleted file mode 100644 index 142f69843a..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-b/src/main/java/B.java +++ /dev/null @@ -1,4 +0,0 @@ -public class B -{ -} - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/pom.xml b/its/core-it-suite/src/test/resources/mng-0820/test-component-c/pom.xml deleted file mode 100644 index 54d13a582d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - - maven-it-it0084 - org.apache.maven.its.it0084 - 0.1 - - test-component-c - 0.1 - Test Component C - war - - - org.apache.maven - maven-core-it-support - 1.4 - - - org.apache.maven.its.it0084 - test-component-a - 0.1 - - - org.apache.maven.its.it0084 - test-component-b - 0.1 - - - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/java/C.java b/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/java/C.java deleted file mode 100644 index d68e4842a8..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/java/C.java +++ /dev/null @@ -1,6 +0,0 @@ -package it0084; - -public class C -{ -} - diff --git a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/webapp/WEB-INF/web.xml b/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 92bb2e9825..0000000000 --- a/its/core-it-suite/src/test/resources/mng-0820/test-component-c/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/its/core-it-suite/src/test/resources/mng-1412/pom.xml b/its/core-it-suite/src/test/resources/mng-1412/pom.xml index 89a730bf8d..f4275a49a7 100644 --- a/its/core-it-suite/src/test/resources/mng-1412/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-1412/pom.xml @@ -1,45 +1,98 @@ - + + + + + 4.0.0 - org.apache.maven.its - maven-it-MNG1412-DependenciesOrder - 0.0.1-SNAPSHOT - Check that dependencies are available in classpath in same order as declared in POM + + org.apache.maven.its.mng1412 + test + 0.1-SNAPSHOT + + Maven Integration Test :: MNG-1412 + + Check that dependencies are available in classpath in same order as declared in POM. + + + + + maven-core-it + file:///${basedir}/repo + + ignore + + + false + + + + + + + org.apache.maven.its.mng1412 + a + 0.1 + + + org.apache.maven.its.mng1412 + c + 0.1 + + + org.apache.maven.its.mng1412 + b + 0.1 + + + org.apache.maven.its.mng1412 + d + 0.1 + + - maven-surefire-plugin - 2.3.1 + org.apache.maven.its.plugins + maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT + + target/compile-artifacts.txt + target/compile-classpath.txt + target/runtime-artifacts.txt + target/runtime-classpath.txt + target/test-artifacts.txt + target/test-classpath.txt + 1 + + + + validate + + compile + runtime + test + + + - - - - commons-net - commons-net - 1.4.1 - - - commons-collections - commons-collections - 3.2 - - - commons-lang - commons-lang - 2.3 - - - commons-io - commons-io - 1.3.1 - - - junit - junit - 3.8.1 - test - - - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.jar b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.jar new file mode 100644 index 0000000000..7480c21521 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.pom b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.pom new file mode 100644 index 0000000000..45b4adffa0 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/0.1/a-0.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng1412 + a + 0.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/maven-metadata.xml new file mode 100644 index 0000000000..887c4e5b5a --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/a/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng1412 + a + 0.1 + + 0.1 + + 0.1 + + 20090201203134 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.jar b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.jar new file mode 100644 index 0000000000..c18ce609f0 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.pom b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.pom new file mode 100644 index 0000000000..20ecfb92ba --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/0.1/b-0.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng1412 + b + 0.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/maven-metadata.xml new file mode 100644 index 0000000000..6eb868116f --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/b/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng1412 + b + 0.1 + + 0.1 + + 0.1 + + 20090201203222 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.jar b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.jar new file mode 100644 index 0000000000..ebfe3fdd77 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.pom b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.pom new file mode 100644 index 0000000000..0e53befdec --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/0.1/c-0.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng1412 + c + 0.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/maven-metadata.xml new file mode 100644 index 0000000000..921c1a6ab8 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/c/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng1412 + c + 0.1 + + 0.1 + + 0.1 + + 20090201203229 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.jar b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.jar new file mode 100644 index 0000000000..f25246eee2 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.pom b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.pom new file mode 100644 index 0000000000..8605d44bcb --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/0.1/d-0.1.pom @@ -0,0 +1,40 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng1412 + d + 0.1 + jar + + + true + + + + + maven-core-it + file:///${basedir}/repo + + + diff --git a/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/maven-metadata.xml new file mode 100644 index 0000000000..8ca8e453a4 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-1412/repo/org/apache/maven/its/mng1412/d/maven-metadata.xml @@ -0,0 +1,12 @@ + + org.apache.maven.its.mng1412 + d + 0.1 + + 0.1 + + 0.1 + + 20090201203236 + + \ No newline at end of file diff --git a/its/core-it-suite/src/test/resources/mng-1412/src/test/java/org/apache/maven/its/itmng1412/ITmng1412DependenciesOrderTest.java b/its/core-it-suite/src/test/resources/mng-1412/src/test/java/org/apache/maven/its/itmng1412/ITmng1412DependenciesOrderTest.java deleted file mode 100644 index 957ef3228c..0000000000 --- a/its/core-it-suite/src/test/resources/mng-1412/src/test/java/org/apache/maven/its/itmng1412/ITmng1412DependenciesOrderTest.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.apache.maven.its.itmng1412; - -import java.io.IOException; -import java.net.URL; -import java.util.Enumeration; -import java.util.jar.Attributes; -import java.util.jar.Manifest; - -import org.apache.commons.lang.StringUtils; - -import junit.framework.TestCase; - -/** - * Test that dependencies order in classpath matches pom.xml. - * - * @author Herve Boutemy - * - */ -public class ITmng1412DependenciesOrderTest -extends TestCase -{ - private final static String[] EXTENSIONS = { - // same order as in pom.xml - "commons-net", - "commons-collections", - "commons-lang", - "commons-io", - }; - - public void testOrder() throws IOException - { - String expected = StringUtils.join( EXTENSIONS, ',' ); - StringBuffer found = new StringBuffer(); - - Enumeration resources = this.getClass().getClassLoader().getResources( "META-INF/MANIFEST.MF" ); - while ( resources.hasMoreElements() ) - { - URL url = (URL) resources.nextElement(); - - Manifest manifest = new Manifest( url.openStream() ); - Attributes attributes = manifest.getMainAttributes(); - String extensionName = attributes.getValue( "Extension-Name" ); - - if ( ( extensionName != null ) && extensionName.startsWith( "commons" ) ) - { - if ( found.length() > 0 ) - { - found.append( ',' ); - } - found.append( extensionName ); - } - } - - System.out.println( "Expected:\n\n" + expected + "\n\nFound:\n\n" + found ); - - assertEquals( "dependencies order in classpath should match pom.xml", expected, found.toString() ); - } -}