Update to as much as possible only use dependencies in the maven central repo and for where thats not possible define the other repository in the module that uses it not the top level pom.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1063664 13f79535-47bb-0310-9956-ffa450edef68

21 files changed, 32 insertions, 75 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
index c61bf5dc7b..3de6afffc6 100644
--- a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api http://jira.codehaus.org/browse/MEV-498 -->
                 <dependencies>
                     <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
index 0e5ac16fcb..f7e5463b6d 100644
--- a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
@@ -33,13 +33,6 @@
 
     <dependencies>
     
-        <!-- This is the SCA API bundle: published by OASIS -->
-        <dependency>
-            <groupId>org.oasis-open.sca.j</groupId>
-            <artifactId>sca-caa-apis</artifactId>
-            <version>1.1-CD04</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
index 75856a4c74..cc2ea3676f 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
@@ -189,7 +189,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- 
                      Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
index 56f27c3c0d..182e561704 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- 
                      Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
index df9036fbe7..20310a0f1c 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
@@ -31,31 +31,6 @@
     <version>2.0-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
index 1138b5c6ec..9bfb2f74b2 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
@@ -32,31 +32,6 @@
     <version>2.0-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index e584372593..e9a3602f5d 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index 77c83f27c6..f43eadc3b5 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
index 356fb26193..f005e9ec30 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
index e64f40273f..6b705e9041 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index 7274efeb3c..a29f22c5e9 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 57fbf5f5f9..f296cd301c 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
index 4b1b4b5e77..4e36da2cf2 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
index 5a1d0b9780..4ef6e1513b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index bcf322afcc..6682e1486a 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
index 8c800cae47..059a2c77fd 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
index 0711bd3ca0..503d366e75 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
index 3acc03c10f..5de77cd8f3 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
index 8eb95dddef..054ea6fdad 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -77,7 +77,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
index 1a75336754..a62921603f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
@@ -29,6 +29,20 @@
     <artifactId>itest-ws-external-client</artifactId>

     <name>Apache Tuscany SCA iTest WS External Client</name>

 

+    <repositories>

+        <repository>

+            <id>java.net</id>

+            <name>java.net Maven 1.x Repository</name>

+            <url>http://download.java.net/maven/1</url>

+            <layout>legacy</layout>

+        </repository>

+        <repository>

+            <id>java.net2</id>

+            <name>java.net Maven 2.x Repository</name>

+            <url>http://download.java.net/maven/2</url>

+        </repository>

+    </repositories>

+

     <dependencies>

 

         <dependency>

@@ -65,7 +79,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->

diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
index f789844419..0634b52345 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
@@ -60,7 +60,7 @@
             <plugin>

                 <groupId>org.codehaus.mojo</groupId>

                 <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

+                <version>1.10</version>

                 <!-- Explicitly add the transitive dependencies for jaxws-api

                      http://jira.codehaus.org/browse/MEV-498

                 -->