Author: rfeng
Date: Fri Nov 20 21:14:42 2009
New Revision: 882717
URL: http://svn.apache.org/viewvc?rev=882717&view=rev
Log:
Use pluginManagement to control maven antrun plugin
Modified:
tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml
tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml
tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml
tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
tuscany/java/sca/modules/web-javascript-dojo/pom.xml
tuscany/java/sca/pom.xml
tuscany/java/sca/shades/base/pom.xml
tuscany/java/sca/shades/webservices/pom.xml
Modified: tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/bin-distro-unzip/pom.xml Fri Nov 20
21:14:42 2009
@@ -52,16 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<id>run-samples</id>
Modified: tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml Fri Nov
20 21:14:42 2009
@@ -42,24 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- <!-- this JDk dependency is a workaround for Maven bug -
http://jira.codehaus.org/browse/MNG-1323 -->
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<id>run-samples</id>
Modified: tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml Fri Nov 20
21:14:42 2009
@@ -42,24 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- <!-- this JDk dependency is a workaround for Maven bug -
http://jira.codehaus.org/browse/MNG-1323 -->
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<id>run-samples</id>
Modified: tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml (original)
+++ tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml Fri Nov 20
21:14:42 2009
@@ -77,24 +77,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- <!-- this JDk dependency is a workaround for Maven bug -
http://jira.codehaus.org/browse/MNG-1323 -->
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
-
<executions>
<execution>
<id>run-samples</id>
Modified: tuscany/java/sca/modules/web-javascript-dojo/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/web-javascript-dojo/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/java/sca/modules/web-javascript-dojo/pom.xml Fri Nov 20 21:14:42
2009
@@ -64,22 +64,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- <!-- this JDk dependency is a workaround for Maven bug -
http://jira.codehaus.org/browse/MNG-1323 -->
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>install-dojo</id>
Modified: tuscany/java/sca/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/pom.xml (original)
+++ tuscany/java/sca/pom.xml Fri Nov 20 21:14:42 2009
@@ -705,6 +705,15 @@
<artifactId>ant-trax</artifactId>
<version>1.7.1</version>
</dependency>
+ <!-- this JDk dependency is a workaround for Maven bug
- http://jira.codehaus.org/browse/MNG-1323 -->
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6</version>
+ <scope>system</scope>
+
<systemPath>${java.home}/../lib/tools.jar</systemPath>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</plugin>
Modified: tuscany/java/sca/shades/base/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/shades/base/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/shades/base/pom.xml (original)
+++ tuscany/java/sca/shades/base/pom.xml Fri Nov 20 21:14:42 2009
@@ -207,6 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
<executions>
<execution>
<phase>package</phase>
Modified: tuscany/java/sca/shades/webservices/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/shades/webservices/pom.xml?rev=882717&r1=882716&r2=882717&view=diff
==============================================================================
--- tuscany/java/sca/shades/webservices/pom.xml (original)
+++ tuscany/java/sca/shades/webservices/pom.xml Fri Nov 20 21:14:42 2009
@@ -157,6 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <version>1.2.1</version>
<executions>
<execution>
<phase>package</phase>
