diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-07 17:09:58 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-07 17:09:58 +0000 |
commit | 9ab3d5a7c1860791c91837d9d467bc87043f1f12 (patch) | |
tree | ae1dc592ffde5dc3f6640f2e6e7040d6c53b264e /sca-java-2.x/trunk | |
parent | caf704f2d81d04c481d4624440908a13c418a222 (diff) |
Change shade jars to use their own groupid and add the new ones to the build
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@896929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r-- | sca-java-2.x/trunk/shades/base-nodep/pom.xml | 4 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/base/pom.xml | 21 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/pom.xml | 6 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/spring-nodep/pom.xml | 5 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/spring/pom.xml | 19 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/webservices-nodep/pom.xml | 9 | ||||
-rw-r--r-- | sca-java-2.x/trunk/shades/webservices/pom.xml | 29 |
7 files changed, 54 insertions, 39 deletions
diff --git a/sca-java-2.x/trunk/shades/base-nodep/pom.xml b/sca-java-2.x/trunk/shades/base-nodep/pom.xml index d94375409e..2c52e66df9 100644 --- a/sca-java-2.x/trunk/shades/base-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/base-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/base/pom.xml b/sca-java-2.x/trunk/shades/base/pom.xml index fac7ab3645..d147f3511a 100644 --- a/sca-java-2.x/trunk/shades/base/pom.xml +++ b/sca-java-2.x/trunk/shades/base/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/pom.xml b/sca-java-2.x/trunk/shades/pom.xml index 478ec1a933..9604f953ea 100644 --- a/sca-java-2.x/trunk/shades/pom.xml +++ b/sca-java-2.x/trunk/shades/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml index 2ed66c0653..16c576d159 100644 --- a/sca-java-2.x/trunk/shades/spring-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/spring-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/spring/pom.xml b/sca-java-2.x/trunk/shades/spring/pom.xml index 2a09fc968d..6fe1a6d999 100644 --- a/sca-java-2.x/trunk/shades/spring/pom.xml +++ b/sca-java-2.x/trunk/shades/spring/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml index 2b509e9af2..3472e3a98d 100644 --- a/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices-nodep/pom.xml @@ -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>
diff --git a/sca-java-2.x/trunk/shades/webservices/pom.xml b/sca-java-2.x/trunk/shades/webservices/pom.xml index 77ef27cc5f..8254751241 100644 --- a/sca-java-2.x/trunk/shades/webservices/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices/pom.xml @@ -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>
|