Centralise the lifecycle-mapping "plugin" configuration. Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/e2a2b182 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/e2a2b182 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/e2a2b182
Branch: refs/heads/master Commit: e2a2b1822b07a166cb800096792862271b67cf7c Parents: 798defd Author: Donal Fellows <[email protected]> Authored: Tue Sep 13 14:06:35 2016 +0100 Committer: Donal Fellows <[email protected]> Committed: Tue Sep 13 14:06:35 2016 +0100 ---------------------------------------------------------------------- pom.xml | 161 ++++++++++++++++++++++++++++---- taverna-server-client/pom.xml | 56 ----------- taverna-server-usagerecord/pom.xml | 30 ------ taverna-server-webapp/pom.xml | 78 ---------------- taverna-server-worker/pom.xml | 28 ------ 5 files changed, 145 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4c0d79f..94fe9e9 100644 --- a/pom.xml +++ b/pom.xml @@ -119,26 +119,155 @@ executing.</description> </dependency> </dependencies> </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.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> <configuration> - <excludes> - <!-- These refer to files under the Apache license, but which have no comment syntax. --> - <exclude>CITATION</exclude> - <exclude>**/META-INF/MANIFEST.MF</exclude> - <exclude>**/WEB-INF/lib/*.vtmpl</exclude> - <exclude>**/org.apache.cxf.Logger</exclude> - - <!-- Cause problems with RAT; need replacing --> - <exclude>**/jquery*.js</exclude> - <exclude>**/jquery*.css</exclude> - </excludes> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <versionRange>[1.3.1,)</versionRange> + <goals> + <goal>xjc</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.jvnet.ws.wadl</groupId> + <artifactId>wadl-client-plugin</artifactId> + <versionRange>[1.1.6,)</versionRange> + <goals> + <goal>generate</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <versionRange>[1.0-alpha-2,)</versionRange> + <goals> + <goal>set-system-properties</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <versionRange>[1.0,)</versionRange> + <goals><goal>process</goal></goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[2.0,)</versionRange> + <goals> + <goal>copy-dependencies</goal> + <goal>unpack</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-maven-plugin</artifactId> + <versionRange>[5,)</versionRange> + <goals> + <goal>enhance</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.datanucleus</groupId> + <artifactId>datanucleus-maven-plugin</artifactId> + <versionRange>[5,)</versionRange> + <goals> + <goal>schema-create</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <versionRange>[2.1.4,)</versionRange> + <goals> + <goal>revision</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute /> + </action> + </pluginExecution> + <pluginExecution> + <pluginExecutionFilter> + <groupId>net.alchim31.maven</groupId> + <artifactId>yuicompressor-maven-plugin</artifactId> + <versionRange>[1.0.0,)</versionRange> + <goals> + <goal>compress</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> </configuration> </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <!-- These refer to files under the Apache license, but which have no comment syntax. --> + <exclude>CITATION</exclude> + <exclude>**/META-INF/MANIFEST.MF</exclude> + <exclude>**/WEB-INF/lib/*.vtmpl</exclude> + <exclude>**/org.apache.cxf.Logger</exclude> + + <!-- Cause problems with RAT; need replacing --> + <exclude>**/jquery*.js</exclude> + <exclude>**/jquery*.css</exclude> + </excludes> + </configuration> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-client/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-client/pom.xml b/taverna-server-client/pom.xml index 980fd2c..3250e5c 100644 --- a/taverna-server-client/pom.xml +++ b/taverna-server-client/pom.xml @@ -40,7 +40,6 @@ limitations under the License. <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> @@ -112,60 +111,5 @@ limitations under the License. </configuration> </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.jvnet.ws.wadl - </groupId> - <artifactId> - wadl-client-plugin - </artifactId> - <versionRange> - [1.1.6,) - </versionRange> - <goals> - <goal>generate</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - properties-maven-plugin - </artifactId> - <versionRange> - [1.0-alpha-2,) - </versionRange> - <goals> - <goal>set-system-properties</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-usagerecord/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-usagerecord/pom.xml b/taverna-server-usagerecord/pom.xml index a0dcec2..6af20db 100644 --- a/taverna-server-usagerecord/pom.xml +++ b/taverna-server-usagerecord/pom.xml @@ -44,36 +44,6 @@ limitations under the License. </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.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <versionRange>[1.3.1,)</versionRange> - <goals> - <goal>xjc</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml index 81acbb6..5ba9bba 100644 --- a/taverna-server-webapp/pom.xml +++ b/taverna-server-webapp/pom.xml @@ -449,84 +449,6 @@ limitations under the License. </dependency> </dependencies> </plugin> - <!--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-dependency-plugin</artifactId> - <versionRange>[2.0,)</versionRange> - <goals> - <goal>copy-dependencies</goal> - <goal>unpack</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-maven-plugin</artifactId> - <versionRange>${version.datanucleus}</versionRange> - <goals> - <goal>enhance</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>pl.project13.maven</groupId> - <artifactId>git-commit-id-plugin</artifactId> - <versionRange>[2.1.4,)</versionRange> - <goals> - <goal>revision</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-maven-plugin</artifactId> - <versionRange>${version.datanucleus}</versionRange> - <goals> - <goal>schema-create</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId>net.alchim31.maven</groupId> - <artifactId>yuicompressor-maven-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> - <goals> - <goal>compress</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> </plugins> </pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/e2a2b182/taverna-server-worker/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-worker/pom.xml b/taverna-server-worker/pom.xml index a4dad91..4b8df5d 100644 --- a/taverna-server-worker/pom.xml +++ b/taverna-server-worker/pom.xml @@ -95,33 +95,5 @@ limitations under the License. </executions> </plugin> </plugins> - <pluginManagement> - <plugins> - <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-assembly-plugin</artifactId> - <versionRange>[2.0,)</versionRange> - <goals> - <goal>single</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project>
