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

10 files changed, 80 insertions, 95 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
index 129d1e4641..2241d67853 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
@@ -145,7 +145,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/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
index 7bfaa760c1..8d1d31bcce 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
@@ -102,7 +102,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.7.1</version>
+                <version>0.7.4</version>
                 <executions>
                     <execution>
                         <id>generate-jaxb</id>
diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
index 71216663e0..855356d341 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
@@ -47,26 +47,6 @@
 
     </dependencies>
 
-    <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>
-    </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>
-
     <build>
         <plugins>
             <plugin>
@@ -99,7 +79,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.7.1</version>
+                <version>0.7.4</version>
                 <executions>
                     <execution>
                         <id>generate-jaxb</id>
diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
index 7b2bfab812..222baf5c8e 100644
--- a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
@@ -73,25 +73,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>runtime</artifactId>
-            <version>3.4.0-v20080512</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.core</groupId>
-                    <artifactId>contenttype</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>contenttype</artifactId>
-            <version>3.3.0-v20080604-1400</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
             <version>3.1</version>
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
index b5a67a2a98..ceff78cc86 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
@@ -27,6 +27,21 @@
     </parent>
     <artifactId>tuscany-implementation-bpel-runtime</artifactId>
     <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>
+
+    <!-- for Saxon 9.x -->
+    <repositories>
+        <repository>
+            <id>intalio.org</id>
+            <url>http://www.intalio.org/public/maven2</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+        </repository>     
+    </repositories>     
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
index 87c099c741..4ce3b6bfc3 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
@@ -73,28 +73,6 @@
 
     </dependencies>
 
-    <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>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>
@@ -119,7 +97,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/modules/interface-wsdl/pom.xml b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
index d6f17f03f6..5d025cd4bc 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
@@ -62,19 +62,4 @@
 
     </dependencies>
 
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
index b31d1e6d9f..de19177f81 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
@@ -94,7 +94,62 @@
             <scope>test</scope>
         </dependency-->
 
+        <dependency>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>runtime</artifactId>
+            <version>3.4.0-v20080512</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.core</groupId>
+                    <artifactId>contenttype</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>registry</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>preferences</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.core</groupId>
+                    <artifactId>jobs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>app</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>contenttype</artifactId>
+            <version>3.3.0-v20080604-1400</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>registry</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>preferences</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
+    <repositories>
+        <!-- Tuscany repository to hold artifacts that are not published in the public maven repos -->
+        <repository>
+            <id>tuscany.repo</id>
+            <name>Tuscany Maven 2.x Repository</name>
+            <url>http://svn.apache.org/repos/asf/tuscany/maven</url>
+        </repository>
+
+    </repositories>
+
 
     <build>
         <plugins>
diff --git a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
index 36c3d401b8..176d05b2e5 100644
--- a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
+++ b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
@@ -60,6 +60,12 @@
             <version>${pom.version}</version>

         </dependency>

 

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-implementation-osgi-runtime</artifactId>

+            <version>${pom.version}</version>

+        </dependency>

+

     </dependencies>

 

 </project>

diff --git a/sca-java-2.x/trunk/modules/xsd/pom.xml b/sca-java-2.x/trunk/modules/xsd/pom.xml
index e9f6b78c2f..767bab3327 100644
--- a/sca-java-2.x/trunk/modules/xsd/pom.xml
+++ b/sca-java-2.x/trunk/modules/xsd/pom.xml
@@ -47,19 +47,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
 </project>