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 2010/01/07 18:10:41 UTC
svn commit: r896929 - in /tuscany/sca-java-2.x/trunk/shades:
base-nodep/pom.xml base/pom.xml pom.xml spring-nodep/pom.xml spring/pom.xml
webservices-nodep/pom.xml webservices/pom.xml
Author: antelder
Date: Thu Jan 7 17:09:58 2010
New Revision: 896929
URL: http://svn.apache.org/viewvc?rev=896929&view=rev
Log:
Change shade jars to use their own groupid and add the new ones to the build
Modified:
tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/base/pom.xml
tuscany/sca-java-2.x/trunk/shades/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
Modified: tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base-nodep/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,13 +26,13 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base-nodep</artifactId>
<name>Apache Tuscany SCA Base Jar</name>
<dependencies>
-
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tuscany/sca-java-2.x/trunk/shades/base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/base/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/base/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/base/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,53 +26,54 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base</artifactId>
<name>Apache Tuscany SCA Base Jar</name>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-node</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-launcher</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-endpoint-hazelcast</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-client-javascript</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-client-rmi</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>${pom.version}</version>
<exclusions>
@@ -96,7 +97,7 @@
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jms-runtime</artifactId>
<version>${pom.version}</version>
<exclusions>
Modified: tuscany/sca-java-2.x/trunk/shades/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/pom.xml Thu Jan 7 17:09:58 2010
@@ -25,14 +25,18 @@
<relativePath>../pom.xml</relativePath>
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>tuscany-shades</artifactId>
<packaging>pom</packaging>
<name>Apache Tuscany SCA Shaded Jars</name>
<modules>
<module>base</module>
+ <module>base-nodep</module>
+ <module>spring</module>
+ <module>spring-nodep</module>
<module>webservices</module>
+ <module>webservices-nodep</module>
</modules>
</project>
Modified: tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring-nodep/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,19 +26,20 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-spring-nodep</artifactId>
<name>Apache Tuscany SCA Spring Support Jar including dependencies</name>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-spring</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
Modified: tuscany/sca-java-2.x/trunk/shades/spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/spring/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/spring/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,52 +26,53 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-spring</artifactId>
<name>Apache Tuscany SCA Spring Support Jar</name>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-spring</artifactId>
<version>${pom.version}</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-spring-sca</artifactId>
<version>${pom.version}</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,15 +26,22 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-webservices-nodep</artifactId>
<name>Apache Tuscany SCA Web Services Jar</name>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-webservices</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
+ <artifactId>tuscany-base</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml?rev=896929&r1=896928&r2=896929&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml Thu Jan 7 17:09:58 2010
@@ -26,62 +26,63 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-webservices</artifactId>
<name>Apache Tuscany SCA Web Services Jar</name>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${pom.version}</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java-jaxws</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core-databinding</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-jaxb</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core-spi</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-xsd</artifactId>
</exclusion>
<exclusion>
@@ -152,7 +153,7 @@
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tuscany.sca.shades</groupId>
<artifactId>tuscany-base</artifactId>
<version>${pom.version}</version>
<scope>provided</scope>