From be276ab42233b65fc746ce883bbb5d3d1e38a242 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 22 Sep 2010 12:51:15 +0000
Subject: Keep the generated tuscany-sca-manifest.jar in sync with the contents
 of the lib directory

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@999920 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.6.1/distribution/manifest/pom.xml   | 63 ++++++++++++++++++++--
 1 file changed, 58 insertions(+), 5 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml')

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
index 36532f64b8..8dce42ef24 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/manifest/pom.xml
@@ -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>
@@ -80,6 +87,16 @@
             <artifactId>tuscany-binding-corba-runtime</artifactId>
             <version>${pom.version}</version>
         </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>
@@ -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>
@@ -368,6 +399,11 @@
             <artifactId>tuscany-databinding-sdo-axiom</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-databinding-xmlbeans</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-corba-jse-tns</artifactId>
@@ -580,6 +616,11 @@
             <artifactId>tuscany-policy-security-geronimo</artifactId>
             <version>${pom.version}</version>
         </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>
@@ -626,21 +667,28 @@
             <artifactId>tuscany-workspace-xml</artifactId>
             <version>${pom.version}</version>
         </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>
             <artifactId>tuscany-sca-api</artifactId>
             <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>
@@ -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>
-- 
cgit v1.2.3