From 18101df48721ba0d528d35b9b8d2be3c285a6a91 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 Oct 2010 13:16:55 +0000
Subject: Merge r1006268 TUSCANY-3706: Fix dependencies on JAX-WS APIs and
 runtime

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027538 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/itest/wsdlgen/pom.xml  | 23 +++++++++++++++++------
 sca-java-1.x/trunk/itest/wsdlless/pom.xml | 10 ++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'sca-java-1.x/trunk/itest')

diff --git a/sca-java-1.x/trunk/itest/wsdlgen/pom.xml b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
index 444a4ba9a2..b76752ceb1 100644
--- a/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
@@ -99,12 +99,23 @@
             </exclusions>
         </dependency>
 
-      	<dependency>
-        	<groupId>com.sun.xml.ws</groupId>
-        	<artifactId>jaxws-rt</artifactId>
-        	<version>2.1.4</version>
-      	</dependency> 
-      	        
+        <!-- Add javax.xml.ws.soap.Addressing in case the build is using
+             the bad version of jaxws-api with this class missing
+        -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1.4</version>
+            <scope>test</scope>
+        </dependency>
+       
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/sca-java-1.x/trunk/itest/wsdlless/pom.xml b/sca-java-1.x/trunk/itest/wsdlless/pom.xml
index a4248bad76..cddf93f701 100644
--- a/sca-java-1.x/trunk/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/trunk/itest/wsdlless/pom.xml
@@ -98,6 +98,16 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Add javax.xml.ws.soap.Addressing in case the build is using
+             the bad version of jaxws-api with this class missing
+        -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
-- 
cgit v1.2.3