You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/25 13:17:07 UTC
svn commit: r1027061 -
/tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml
Author: nash
Date: Mon Oct 25 11:17:07 2010
New Revision: 1027061
URL: http://svn.apache.org/viewvc?rev=1027061&view=rev
Log:
Merge r999920 Keep the generated tuscany-sca-manifest.jar in sync with the contents of the lib directory
Modified:
tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml
Modified: tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml?rev=1027061&r1=1027060&r2=1027061&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/distribution/manifest/pom.xml Mon Oct 25 11:17:07 2010
@@ -69,6 +69,13 @@
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-atom-abdera</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- tuscany-binding-ws-axis2 brings in activation-1.1.jar -->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -82,6 +89,16 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-gdata</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-gdata-runtime</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-rss</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -244,6 +261,13 @@
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-notification</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- tuscany-binding-ws-axis2 brings in activation-1.1.jar -->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -287,6 +311,13 @@
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- tuscany-binding-atom-abdera brings in geronimo-javamail_1.4_spec-1.2.jar -->
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -370,6 +401,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-xmlbeans</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-host-corba-jse-tns</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -582,6 +618,11 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-policy-security-jsr250</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-policy-xml</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -628,13 +669,15 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-java2wsdl</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-wsdl2java</artifactId>
<version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- tuscany-binding-atom-abdera brings in geronimo-javamail_1.4_spec-1.2.jar -->
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -642,6 +685,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-tracing-aspectj</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.1.1</version>
@@ -656,6 +704,11 @@
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
+ <exclusion>
+ <!-- exclude stax 1.0.1 because sca uses 1.0-2 (newer) -->
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>