Merge the fix from 1.3 branch for TUSCANY-2509, TUSCANY-2506

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681137 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 60 insertions, 14 deletions

diff --git a/java/sca/distribution/bundle/pom.xml b/java/sca/distribution/bundle/pom.xml
index 3d4ea7ff92..9a72908c41 100644
--- a/java/sca/distribution/bundle/pom.xml
+++ b/java/sca/distribution/bundle/pom.xml
@@ -459,6 +459,15 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-wsdl2java</artifactId>
             <version>${pom.version}</version>
+            <exclusions>
+
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+
+            </exclusions>
         </dependency>
 
   <!-- dependencies to keep in the shaded pom.xml -->
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml
index 0f50571fbf..71b47668c7 100644
--- a/java/sca/distribution/pom.xml
+++ b/java/sca/distribution/pom.xml
@@ -82,14 +82,20 @@
                     <groupId>javax.mail</groupId>
                     <artifactId>mail</artifactId>
                 </exclusion>
+                <!--
                 <exclusion>
                     <groupId>javax.activation</groupId>
                     <artifactId>activation</artifactId>
                 </exclusion>
-                     <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-                     </exclusion>
+                -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
             </exclusions>
        </dependency>
         <dependency>
diff --git a/java/sca/modules/binding-atom-abdera/pom.xml b/java/sca/modules/binding-atom-abdera/pom.xml
index f7bda483b2..72caa56169 100644
--- a/java/sca/modules/binding-atom-abdera/pom.xml
+++ b/java/sca/modules/binding-atom-abdera/pom.xml
@@ -82,6 +82,12 @@
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
             <version>0.3.0-incubating</version> 
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>    
         
         <dependency>
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index 1b8e743f3c..0c942e7786 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -343,6 +343,11 @@
                    <groupId>javax.servlet</groupId>
                    <artifactId>servlet-api</artifactId>
                </exclusion>
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>stax</groupId>
                     <artifactId>stax-api</artifactId>
@@ -379,6 +384,12 @@
                     <groupId>stax</groupId>
                     <artifactId>stax-api</artifactId>
                 </exclusion>
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
+
             </exclusions>
         </dependency>
 
@@ -419,6 +430,14 @@
                     <groupId>stax</groupId>
                     <artifactId>stax-api</artifactId>
                 </exclusion>
+
+
+                <!-- Exclude XmlSchema 1.3.1 -->
+                <exclusion>
+                    <groupId>org.apache.ws.commons.schema</groupId>
+                    <artifactId>XmlSchema</artifactId>
+                </exclusion>
+
             </exclusions>
         </dependency>
         <dependency>
diff --git a/java/sca/modules/databinding-json/pom.xml b/java/sca/modules/databinding-json/pom.xml
index 9142ca56bc..bc4a149b91 100644
--- a/java/sca/modules/databinding-json/pom.xml
+++ b/java/sca/modules/databinding-json/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <version>1.0</version>
+            <version>1.0.1</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/java/sca/modules/interface-java-jaxws/pom.xml b/java/sca/modules/interface-java-jaxws/pom.xml
index 0ff64a83b2..c673a74ef2 100644
--- a/java/sca/modules/interface-java-jaxws/pom.xml
+++ b/java/sca/modules/interface-java-jaxws/pom.xml
@@ -162,7 +162,7 @@
                 <executions>
                     <execution>
                         <id>wsimport</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>wsimport</goal>
                         </goals>
diff --git a/java/sca/samples/pom.xml b/java/sca/samples/pom.xml
index 816ccfc4cc..b0fa55d0bd 100644
--- a/java/sca/samples/pom.xml
+++ b/java/sca/samples/pom.xml
@@ -96,6 +96,7 @@
                 <module>store-distributed</module>
                 <module>supplychain</module>
                 <module>web-resource</module>
+                <module>zipcode-jaxws</module>
             </modules>
         </profile>
     </profiles>
diff --git a/java/sca/samples/zipcode-jaxws/pom.xml b/java/sca/samples/zipcode-jaxws/pom.xml
index 66a27ccbb2..506d95064e 100644
--- a/java/sca/samples/zipcode-jaxws/pom.xml
+++ b/java/sca/samples/zipcode-jaxws/pom.xml
@@ -53,13 +53,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-feed</artifactId>
-            <version>1.4-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>
diff --git a/java/sca/tools/java2wsdl/pom.xml b/java/sca/tools/java2wsdl/pom.xml
index e470860b98..cbbc097515 100644
--- a/java/sca/tools/java2wsdl/pom.xml
+++ b/java/sca/tools/java2wsdl/pom.xml
@@ -133,6 +133,12 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/java/sca/tools/wsdl2java/pom.xml b/java/sca/tools/wsdl2java/pom.xml
index f644007149..91e6caf1ac 100644
--- a/java/sca/tools/wsdl2java/pom.xml
+++ b/java/sca/tools/wsdl2java/pom.xml
@@ -160,6 +160,12 @@
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-codegen</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -225,7 +231,7 @@
                 <executions>
                     <execution>
                         <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
+                        <phase>generate-test-sources</phase>
                         <configuration>
                             <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile>
                             <javaPackage>org.example.creditscore.doclit</javaPackage>