diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 72de1fedf1..bbb7e8b8a6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -251,6 +251,7 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng2591MergeInheritedPluginConfigTest.class ); suite.addTestSuite( MavenITmng2562TimestampTest.class ); suite.addTestSuite( MavenITmng2539PluginDependenciesComeFromPluginReposTest.class ); + suite.addTestSuite( MavenITmng2432PluginPrefixOrderTest.class ); suite.addTestSuite( MavenITmng2387InactiveProxyTest.class ); suite.addTestSuite( MavenITmng2362DeployedPomEncodingTest.class ); suite.addTestSuite( MavenITmng2339BadProjectInterpolationTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java new file mode 100644 index 0000000000..acde90250b --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java @@ -0,0 +1,67 @@ +package org.apache.maven.it; + +/* + * 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. + */ + +import java.io.File; + +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +/** + * This is a test set for MNG-2432 + * + * @author Benjamin Bentmann + * @version $Id$ + */ +public class MavenITmng2432PluginPrefixOrderTest + extends AbstractMavenIntegrationTestCase +{ + + public MavenITmng2432PluginPrefixOrderTest() + { + super( "[3.0-alpha-2,)" ); + } + + /** + * Verify that when resolving plugin prefixes the plugins from the POM are searched before the plugin groups + * from the settings. + */ + public void testitMNG2432() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2432" ); + + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2432.pom" ); + verifier.deleteArtifacts( "org.apache.maven.its.mng2432.settings" ); + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); + verifier.getCliOptions().add( "--settings" ); + verifier.getCliOptions().add( "settings.xml" ); + verifier.executeGoal( "it:touch" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + + verifier.assertFileNotPresent( "target/touch-settings.txt" ); + verifier.assertFilePresent( "target/touch-pom.txt" ); + } + +} diff --git a/its/core-it-suite/src/test/resources/mng-2432/pom.xml b/its/core-it-suite/src/test/resources/mng-2432/pom.xml new file mode 100644 index 0000000000..07f11a01ef --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/pom.xml @@ -0,0 +1,47 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng2432 + test + 0.1 + + Maven Integration Test :: MNG-2432 + + Verify that when resolving plugin prefixes the plugins from the POM are searched before the plugin groups + from the settings. + + + + + + org.apache.maven.its.mng2432.pom + it-maven-plugin + 0.1 + + target/touch-pom.txt + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.jar b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.jar new file mode 100644 index 0000000000..1dd96f7334 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.pom b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.pom new file mode 100644 index 0000000000..e57cb20689 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/0.1/it-maven-plugin-0.1.pom @@ -0,0 +1,69 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng2432.pom + it-maven-plugin + 0.1 + maven-plugin + + Maven Integration Test Plugin :: Touch + + A test plugin that creates an empty file. + + 2009 + + + + maven-core-it + file:///${basedir}/repo + + + + + true + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/maven-metadata.xml new file mode 100644 index 0000000000..6b72bd9a72 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/it-maven-plugin/maven-metadata.xml @@ -0,0 +1,14 @@ + + + org.apache.maven.its.mng2432.pom + it-maven-plugin + 0.1 + + 0.1 + 0.1 + + 0.1 + + 20090306185323 + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/maven-metadata.xml new file mode 100644 index 0000000000..5d8aeab852 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/pom/maven-metadata.xml @@ -0,0 +1,10 @@ + + + + + Maven Integration Test Plugin :: Touch + it + it-maven-plugin + + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.jar b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.jar new file mode 100644 index 0000000000..a57ef0c224 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.pom b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.pom new file mode 100644 index 0000000000..6b6c76adf6 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/0.1/it-maven-plugin-0.1.pom @@ -0,0 +1,69 @@ + + + + + + 4.0.0 + + org.apache.maven.its.mng2432.settings + it-maven-plugin + 0.1 + maven-plugin + + Maven Integration Test Plugin :: Touch + + A test plugin that creates an empty file. + + 2009 + + + + maven-core-it + file:///${basedir}/repo + + + + + true + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + + + + . + + pom.xml + src/** + + + + src/main/resources + + + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/maven-metadata.xml new file mode 100644 index 0000000000..494a961606 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/it-maven-plugin/maven-metadata.xml @@ -0,0 +1,14 @@ + + + org.apache.maven.its.mng2432.settings + it-maven-plugin + 0.1 + + 0.1 + 0.1 + + 0.1 + + 20090306185422 + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/maven-metadata.xml new file mode 100644 index 0000000000..5d8aeab852 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/repo/org/apache/maven/its/mng2432/settings/maven-metadata.xml @@ -0,0 +1,10 @@ + + + + + Maven Integration Test Plugin :: Touch + it + it-maven-plugin + + + diff --git a/its/core-it-suite/src/test/resources/mng-2432/settings-template.xml b/its/core-it-suite/src/test/resources/mng-2432/settings-template.xml new file mode 100644 index 0000000000..4df569758c --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-2432/settings-template.xml @@ -0,0 +1,58 @@ + + + + + + + org.apache.maven.its.mng2432.settings + + + + maven-core-it-repo + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + maven-core-it + @baseurl@/repo + + ignore + + + false + + + + + + + maven-core-it-repo + +