From 5b25a38af216bbf60a0804068678849dca338ff7 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 30 Jul 2008 17:31:21 +0000
Subject: 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
---
 java/sca/modules/binding-atom-abdera/pom.xml  |  6 ++++++
 java/sca/modules/binding-ws-axis2/pom.xml     | 19 +++++++++++++++++++
 java/sca/modules/databinding-json/pom.xml     |  2 +-
 java/sca/modules/interface-java-jaxws/pom.xml |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'java/sca/modules')

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>
-- 
cgit v1.2.3