diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java index d0e4d45933..067a98fc30 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4274PluginRealmArtifactsTest.java @@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import java.io.File; -import java.util.Arrays; -import java.util.Collection; import java.util.Properties; /** @@ -38,7 +36,7 @@ public class MavenITmng4274PluginRealmArtifactsTest public MavenITmng4274PluginRealmArtifactsTest() { - super( "[2.0.6,)" ); + super( "[3.0-alpha-3,)" ); } /** @@ -53,15 +51,20 @@ public class MavenITmng4274PluginRealmArtifactsTest Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifact( "org.apache.maven", "maven-core", "2.0.4274", "jar" ); + verifier.deleteArtifact( "org.apache.maven", "maven-core", "2.0.4274", "pom" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "jar" ); + verifier.deleteArtifact( "org.codehaus.plexus", "plexus-utils", "1.1.4274", "pom" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "-s" ); + verifier.getCliOptions().add( "settings.xml" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); Properties props = verifier.loadProperties( "target/class.properties" ); - String prop = props.getProperty( "org.codehaus.plexus.util.Expand.methods", "" ); - Collection methods = Arrays.asList( prop.split( "," ) ); - assertTrue( methods.toString(), methods.contains( "normalize" ) ); - assertTrue( methods.toString(), methods.contains( "resolveFile" ) ); + assertNotNull( props.getProperty( "org.apache.maven.its.mng4274.CoreIt" ) ); } } diff --git a/its/core-it-suite/src/test/resources/mng-4274/pom.xml b/its/core-it-suite/src/test/resources/mng-4274/pom.xml index d00719402c..d09bc5373b 100644 --- a/its/core-it-suite/src/test/resources/mng-4274/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-4274/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven.its.mng4274 test 0.1 - maven-plugin + jar Maven Integration Test :: MNG-4274 @@ -42,16 +42,16 @@ under the License. 2.1-SNAPSHOT - + org.apache.maven - maven-project - 2.0 + maven-core + 2.0.4274 target/class.properties - - org.codehaus.plexus.util.Expand + + org.apache.maven.its.mng4274.CoreIt diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar new file mode 100644 index 0000000000..1fa2da239e Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom new file mode 100644 index 0000000000..8cc9c73b28 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/2.0.4274/maven-core-2.0.4274.pom @@ -0,0 +1,51 @@ + + + + + + 4.0.0 + + org.apache.maven + maven-core + 2.0.4274 + jar + + Maven Integration Test :: MNG-4274 :: Maven Core Stub + + A stub version of some Maven core artifact, i.e. an artifact to be excluded from a plugin realm, that itself + depends on the stub version of plexus-utils. This mimics the dependency of maven-project:2.0 on + plexus-utils:1.0.4 for instance. + + + + + maven-core-it + file:///${basedir}/repo + + + + + + org.codehaus.plexus + plexus-utils + 1.1.4274 + + + diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml new file mode 100644 index 0000000000..0c31c45fba --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4274/repo/org/apache/maven/maven-core/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.apache.maven + maven-core + 2.0.4274 + + 2.0.4274 + + 2.0.4274 + + 20090802122327 + + diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar new file mode 100644 index 0000000000..9a272e429f Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom new file mode 100644 index 0000000000..f05fd85ec0 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/1.1.4274/plexus-utils-1.1.4274.pom @@ -0,0 +1,56 @@ + + + + + + 4.0.0 + + org.codehaus.plexus + plexus-utils + 1.1.4274 + jar + + Maven Integration Test :: MNG-4274 :: Plexus Utils Stub + + A stub version of plexus-utils, must have the same groupId:artifactId as the real thing. + + + + + maven-core-it + file:///${basedir}/repo + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml new file mode 100644 index 0000000000..87f191e6d7 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4274/repo/org/codehaus/plexus/plexus-utils/maven-metadata.xml @@ -0,0 +1,13 @@ + + + org.codehaus.plexus + plexus-utils + 1.1.4274 + + 1.1.4274 + + 1.1.4274 + + 20090802121446 + + diff --git a/its/core-it-suite/src/test/resources/mng-4274/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4274/settings-template.xml new file mode 100644 index 0000000000..408c5ccd9e --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-4274/settings-template.xml @@ -0,0 +1,35 @@ + + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +