From af6dec169ae1fda05509009ddc59201dfb2bc01a Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 20 Nov 2009 21:14:42 +0000
Subject: Use pluginManagement to control maven antrun plugin

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882717 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/itest/distribution/bin-distro-unzip/pom.xml   | 10 ----------
 .../itest/distribution/binding-ws-calculator/pom.xml   | 18 ------------------
 java/sca/itest/distribution/calculator-rmi/pom.xml     | 18 ------------------
 java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml    | 18 ------------------
 java/sca/modules/web-javascript-dojo/pom.xml           | 16 ----------------
 java/sca/pom.xml                                       |  9 +++++++++
 java/sca/shades/base/pom.xml                           |  1 +
 java/sca/shades/webservices/pom.xml                    |  1 +
 8 files changed, 11 insertions(+), 80 deletions(-)

(limited to 'java')

diff --git a/java/sca/itest/distribution/bin-distro-unzip/pom.xml b/java/sca/itest/distribution/bin-distro-unzip/pom.xml
index db92564ea4..d58e479f93 100644
--- a/java/sca/itest/distribution/bin-distro-unzip/pom.xml
+++ b/java/sca/itest/distribution/bin-distro-unzip/pom.xml
@@ -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>
diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
index 26d18d0b4a..3f4cb4b536 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml
+++ b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
@@ -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>
diff --git a/java/sca/itest/distribution/calculator-rmi/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml
index f002994692..faf6132fbd 100644
--- a/java/sca/itest/distribution/calculator-rmi/pom.xml
+++ b/java/sca/itest/distribution/calculator-rmi/pom.xml
@@ -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>
diff --git a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
index f503c1792d..1ffccd9fd5 100644
--- a/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
@@ -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>
diff --git a/java/sca/modules/web-javascript-dojo/pom.xml b/java/sca/modules/web-javascript-dojo/pom.xml
index d0cf01f45c..82b53a0f86 100644
--- a/java/sca/modules/web-javascript-dojo/pom.xml
+++ b/java/sca/modules/web-javascript-dojo/pom.xml
@@ -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>
diff --git a/java/sca/pom.xml b/java/sca/pom.xml
index d3a4149103..a509fb7d3a 100644
--- a/java/sca/pom.xml
+++ b/java/sca/pom.xml
@@ -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>
 
diff --git a/java/sca/shades/base/pom.xml b/java/sca/shades/base/pom.xml
index 0e9e451ff6..6148679d66 100644
--- a/java/sca/shades/base/pom.xml
+++ b/java/sca/shades/base/pom.xml
@@ -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>
diff --git a/java/sca/shades/webservices/pom.xml b/java/sca/shades/webservices/pom.xml
index 852aca5ece..60079c6c07 100644
--- a/java/sca/shades/webservices/pom.xml
+++ b/java/sca/shades/webservices/pom.xml
@@ -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>
-- 
cgit v1.2.3