You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/01/26 10:57:51 UTC
svn commit: r1063664 - in /tuscany/sca-java-2.x/trunk: ./
distribution/all/src/main/release/bin/ modules/binding-ws-runtime-jaxws/
modules/databinding-jaxb-axiom/ modules/databinding-jaxb/
modules/databinding-sdo/ modules/implementation-bpel-runtime/ m...
Author: antelder
Date: Wed Jan 26 09:57:50 2011
New Revision: 1063664
URL: http://svn.apache.org/viewvc?rev=1063664&view=rev
Log:
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
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
tuscany/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
tuscany/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
tuscany/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
tuscany/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
tuscany/sca-java-2.x/trunk/modules/xsd/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE Wed Jan 26 09:57:50 2011
@@ -410,11 +410,7 @@ Tuscany SDO dependencies on Eclipse:
common-2.2.3.jar
xsd-2.2.3.jar
runtime-3.4.0-v20080512.jar,
- app-1.2.0-v20090520-1800.jar
contenttype-3.3.0-v20080604-1400.jar
- jobs-3.4.0-v20080512.jar
- preferences-3.2.300-v20090520-1800.jar
- registry-3.4.100-v20090520-1800.jar
Eclipse Public License - v 1.0
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/xsd/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/xsd/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/xsd/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/xsd/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Wed Jan 26 09:57:50 2011
@@ -61,38 +61,6 @@
<!-- Maven Repositories -->
<!-- ====================================================================== -->
<repositories>
- <repository>
- <id>maven.central</id>
- <url>http://repo2.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <!-- Apache SNAPSHOT repository for unreleased artifacts -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
<!-- Tuscany repository to hold artifacts that are not published in the public maven repos -->
<repository>
<id>tuscany.repo</id>
@@ -105,159 +73,10 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <!-- Material for the OASIS SVN repo which holds the standard versions of some JARs -->
- <repository>
- <id>oasis.svn</id>
- <url>http://tools.oasis-open.org/version-control/svn/sca-j/Release/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <!-- End of material for OASIS SVN repo -->
- <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>
- <repository>
- <id>indiana</id>
- <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>osuosl.org</id>
- <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <!-- for Saxon 9.x -->
- <repository>
- <id>intalio.org</id>
- <url>http://www.intalio.org/public/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- <!-- for java.net -->
- <repository>
- <snapshots>
- <enabled>false</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>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<!-- ====================================================================== -->
- <!-- Maven Plugin-Repositories -->
- <!-- ====================================================================== -->
- <pluginRepositories>
- <!-- Apache repository for artifacts released by Apache TLP projects -->
- <pluginRepository>
- <id>apache</id>
- <name>Apache Repository</name>
- <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- <!-- Apache Incubator repository for artifacts released by Incubator projects -->
- <pluginRepository>
- <id>apache.incubator</id>
- <name>Apache Incubator Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- <!-- Apache SNAPSHOT repository for unreleased artifacts -->
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
-
- <!-- Codehaus SNAPSHOT repository -->
- <!--
- <pluginRepository>
- <id>codehaus-snapshot</id>
- <name>Codehaus Snapshot Repository</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- -->
-
- <!-- Maven central repository -->
- <pluginRepository>
- <id>maven.central</id>
- <name>Maven Central Repository</name>
- <url>http://repo2.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
-
- <pluginRepository>
- <id>java.net2</id>
- <name>java.net Maven 2.x Repository</name>
- <url>http://download.java.net/maven/2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <!-- ====================================================================== -->
<!-- Distribution Management configuration -->
<!-- ====================================================================== -->
<distributionManagement>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml Wed Jan 26 09:57:50 2011
@@ -32,10 +32,21 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-all</artifactId>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-osgi-runtime-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml Wed Jan 26 09:57:50 2011
@@ -32,10 +32,21 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-all</artifactId>
+ <artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-osgi-runtime-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/async-services/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/async-services/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/async-services/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
Modified: tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
Modified: tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml Wed Jan 26 09:57:50 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml?rev=1063664&r1=1063663&r2=1063664&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml Wed Jan 26 09:57:50 2011
@@ -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
-->