Author: brianf
Date: Fri Apr 6 18:23:29 2007
New Revision: 526339
URL: http://svn.apache.org/viewvc?view=rev&rev=526339
Log:
MNG-2926 - added IT test to check plugin prefix order.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?view=diff&rev=526339&r1=526338&r2=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Fri Apr 6 18:23:29 2007
@@ -21,7 +21,8 @@
System.setProperty( "maven.version", mavenVersion );
TestSuite suite = new TestSuite();
- suite.addTestSuite( MavenIT0000Test.class );
+ suite.addTestSuite( MavenIT0119PluginPrefixOrder.class );
+ /*suite.addTestSuite( MavenIT0000Test.class );
suite.addTestSuite( MavenIT0001Test.class );
suite.addTestSuite( MavenIT0002Test.class );
suite.addTestSuite( MavenIT0003Test.class );
@@ -135,7 +136,7 @@
suite.addTestSuite( MavenIT0112ExtensionsThatDragDependencies.class );
suite.addTestSuite(
MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class );
suite.addTestSuite( MavenIT0114ExtensionThatProvidesResources.class );
- suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );
+ suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );*/
return suite;
}
}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0119PluginPrefixOrder.java
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,43 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+public class MavenIT0119PluginPrefixOrder
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testit0119()
+ throws Exception
+ {
+ File testDir =
+ ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder" );
+
+ Verifier verifier;
+
+ // Install the parent POM, extension and the plugin
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.deleteArtifact( "org.apache.maven.plugins", "it0119", "1.0",
"jar" );
+ verifier.deleteArtifact( "org.codehaus.mojo", "it0119", "1.0", "jar" );
+ verifier.deleteArtifact( "it0119", "it0119", "1.0", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.it0119",
"it0119-parent", "1.0", "pom" );
+
+
+ List cliOptions = new ArrayList();
+ verifier.executeGoal( "install" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ //now run the test
+ testDir =
+ ResourceExtractor.simpleExtractResources( getClass(),
"/it0119-pluginprefixorder/test-project" );
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.executeGoal( "it0119:apache" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ }
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
Fri Apr 6 18:23:29 2007
@@ -0,0 +1 @@
+This test checks the order of plugin searching. In <2.0.7, Maven searched
codehaus before apache.
\ No newline at end of file
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0119</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>it0119 - parent</name>
+ <modules>
+ <module>test-plugin-apache</module>
+ <module>test-plugin-codehaus</module>
+ <module>test-plugin-custom</module>
+ </modules>
+</project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Apache plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal apache
+ */
+public class ApacheMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Apache");
+ }
+
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Codehaus plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal codehaus
+ */
+public class CodehausMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Codehaus");
+ }
+
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>it0119</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Custom plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,19 @@
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
+ * @goal custom
+ */
+public class CustomMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Custom");
+ }
+
+}
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml?view=auto&rev=526339
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
Fri Apr 6 18:23:29 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>it0114-plugin-runner</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>it0114 - plugin runner</name>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>it0114-extension</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>it0114-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
