You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/03/08 11:40:56 UTC
git commit: use MPLUGIN-159 @requiresDependencyCollection annotation
Repository: maven-integration-testing
Updated Branches:
refs/heads/master 1e9743a7f -> f2932b84c
use MPLUGIN-159 @requiresDependencyCollection annotation
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f2932b84
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f2932b84
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f2932b84
Branch: refs/heads/master
Commit: f2932b84ce787902e71fe80f06ca2be630de3805
Parents: 1e9743a
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Mar 8 11:40:47 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Mar 8 11:40:47 2014 +0100
----------------------------------------------------------------------
.../pom.xml | 52 ----
.../maven/plugin/coreit/AggregateTestMojo.java | 2 +-
.../apache/maven/plugin/coreit/CompileMojo.java | 2 +-
.../apache/maven/plugin/coreit/RuntimeMojo.java | 2 +-
.../apache/maven/plugin/coreit/TestMojo.java | 2 +-
.../main/resources/META-INF/maven/plugin.xml | 279 -------------------
6 files changed, 4 insertions(+), 335 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/pom.xml b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/pom.xml
index f22249e..bac13ba 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/pom.xml
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/pom.xml
@@ -59,56 +59,4 @@ under the License.
<version>2.0</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>delete-incomplete-plugin-descriptor</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- The maven-plugin-plugin does not handle the new anno so delete its bad output -->
- <delete file="${project.build.outputDirectory}/META-INF/maven/plugin.xml"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.2,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
index c407718..76f2a02 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
@@ -32,7 +32,7 @@ import org.apache.maven.project.MavenProject;
* dependencies are dumped.
*
* @goal aggregate-test
- * @requiresDependencyResolution test
+ * @requiresDependencyCollection test
* @aggregator true
*
* @author Benjamin Bentmann
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 170d4ca..3ca9d8c 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -26,7 +26,7 @@ import org.apache.maven.plugin.MojoExecutionException;
* Creates text files that list the dependencies with scope compile in the order returned from the Maven core.
*
* @goal compile
- * @requiresDependencyResolution compile
+ * @requiresDependencyCollection compile
*
* @author Benjamin Bentmann
* @version $Id$
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
index e4e247d..b76dfd4 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
@@ -26,7 +26,7 @@ import org.apache.maven.plugin.MojoExecutionException;
* Creates text files that list the dependencies with scope runtime in the order returned from the Maven core.
*
* @goal runtime
- * @requiresDependencyResolution runtime
+ * @requiresDependencyCollection runtime
*
* @author Benjamin Bentmann
* @version $Id$
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 5a3057f..80e618a 100644
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -26,7 +26,7 @@ import org.apache.maven.plugin.MojoExecutionException;
* Creates text files that list the dependencies with scope test in the order returned from the Maven core.
*
* @goal test
- * @requiresDependencyResolution test
+ * @requiresDependencyCollection test
*
* @author Benjamin Bentmann
* @version $Id$
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f2932b84/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/resources/META-INF/maven/plugin.xml
----------------------------------------------------------------------
diff --git a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/resources/META-INF/maven/plugin.xml b/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/resources/META-INF/maven/plugin.xml
deleted file mode 100644
index 6af6520..0000000
--- a/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/resources/META-INF/maven/plugin.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
- <description>A test plugin that provides several goals which employ @requiresDependencyCollection with different scopes. If
- desired, the resulting artifact identifiers can be written to a text file.</description>
- <groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-dependency-collection</artifactId>
- <version>2.1-SNAPSHOT</version>
- <goalPrefix>itdependency-collection</goalPrefix>
- <isolatedRealm>false</isolatedRealm>
- <inheritedByDefault>true</inheritedByDefault>
- <mojos>
- <mojo>
- <goal>compile</goal>
- <description>Creates text files that list the dependencies with scope compile in the order returned from the Maven core.</description>
- <requiresDependencyCollection>compile</requiresDependencyCollection>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <implementation>org.apache.maven.plugin.coreit.CompileMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>compileArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the compile artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk.</description>
- </parameter>
- <parameter>
- <name>project</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description>The current Maven project.</description>
- </parameter>
- <parameter>
- <name>projectArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the project artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
-that do not contribute to the class path.</description>
- </parameter>
- </parameters>
- <configuration>
- <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
- <compileArtifacts implementation="java.lang.String">${depres.compileArtifacts}</compileArtifacts>
- <projectArtifacts implementation="java.lang.String">${depres.projectArtifacts}</projectArtifacts>
- </configuration>
- </mojo>
- <mojo>
- <goal>aggregate-test</goal>
- <description>Combines dependency collection with aggregation. The path parameters of this mojo support the token
-<code>&#64;artifactId&#64;</code> to dynamically adjust the output file for each project in the reactor whose
-dependencies are dumped.</description>
- <requiresDependencyCollection>test</requiresDependencyCollection>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>true</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <implementation>org.apache.maven.plugin.coreit.AggregateTestMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>project</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description>The current Maven project.</description>
- </parameter>
- <parameter>
- <name>projectArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the project artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
-do not contribute to the class path.</description>
- </parameter>
- <parameter>
- <name>reactorProjects</name>
- <type>java.util.List</type>
- <required>false</required>
- <editable>false</editable>
- <description>The Maven projects in the reactor.</description>
- </parameter>
- </parameters>
- <configuration>
- <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
- <projectArtifacts implementation="java.lang.String">${depres.projectArtifacts}</projectArtifacts>
- <reactorProjects implementation="java.util.List" default-value="${reactorProjects}"/>
- </configuration>
- </mojo>
- <mojo>
- <goal>test</goal>
- <description>Creates text files that list the dependencies with scope test in the order returned from the Maven core.</description>
- <requiresDependencyCollection>test</requiresDependencyCollection>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <implementation>org.apache.maven.plugin.coreit.TestMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>project</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description>The current Maven project.</description>
- </parameter>
- <parameter>
- <name>projectArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the project artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
-do not contribute to the class path.</description>
- </parameter>
- <parameter>
- <name>testArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the test artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk.</description>
- </parameter>
- </parameters>
- <configuration>
- <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
- <projectArtifacts implementation="java.lang.String">${depres.projectArtifacts}</projectArtifacts>
- <testArtifacts implementation="java.lang.String">${depres.testArtifacts}</testArtifacts>
- </configuration>
- </mojo>
- <mojo>
- <goal>runtime</goal>
- <description>Creates text files that list the dependencies with scope runtime in the order returned from the Maven core.</description>
- <requiresDependencyCollection>runtime</requiresDependencyCollection>
- <requiresDirectInvocation>false</requiresDirectInvocation>
- <requiresProject>true</requiresProject>
- <requiresReports>false</requiresReports>
- <aggregator>false</aggregator>
- <requiresOnline>false</requiresOnline>
- <inheritedByDefault>true</inheritedByDefault>
- <implementation>org.apache.maven.plugin.coreit.RuntimeMojo</implementation>
- <language>java</language>
- <instantiationStrategy>per-lookup</instantiationStrategy>
- <executionStrategy>once-per-session</executionStrategy>
- <parameters>
- <parameter>
- <name>project</name>
- <type>org.apache.maven.project.MavenProject</type>
- <required>true</required>
- <editable>false</editable>
- <description>The current Maven project.</description>
- </parameter>
- <parameter>
- <name>projectArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the project artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk. Unlike the runtime artifacts, the collection of project artifacts additionally contains those artifacts
-that do not contribute to the class path.</description>
- </parameter>
- <parameter>
- <name>runtimeArtifacts</name>
- <type>java.lang.String</type>
- <required>false</required>
- <editable>true</editable>
- <description>The path to the output file for the runtime artifacts, relative to the project base directory. Each line of this
-UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
-disk.</description>
- </parameter>
- </parameters>
- <configuration>
- <project implementation="org.apache.maven.project.MavenProject" default-value="${project}"/>
- <projectArtifacts implementation="java.lang.String">${depres.projectArtifacts}</projectArtifacts>
- <runtimeArtifacts implementation="java.lang.String">${depres.runtimeArtifacts}</runtimeArtifacts>
- </configuration>
- </mojo>
- </mojos>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-profile</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <type>jar</type>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <type>jar</type>
- <version>1.0-alpha-8</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <type>jar</type>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <type>jar</type>
- <version>1.1-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-repository-metadata</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <type>jar</type>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <type>jar</type>
- <version>1.0-alpha-5</version>
- </dependency>
- </dependencies>
-</plugin>
\ No newline at end of file