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

1 files changed, 58 insertions, 5 deletions

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>
@@ -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>
@@ -369,6 +400,11 @@
             <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>
             <version>${pom.version}</version>
@@ -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>