You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/26 15:16:55 UTC

svn commit: r1027538 - in /tuscany/sca-java-1.x/trunk/itest: wsdlgen/pom.xml wsdlless/pom.xml

Author: nash
Date: Tue Oct 26 13:16:55 2010
New Revision: 1027538

URL: http://svn.apache.org/viewvc?rev=1027538&view=rev
Log:
Merge r1006268 TUSCANY-3706: Fix dependencies on JAX-WS APIs and runtime

Modified:
    tuscany/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
    tuscany/sca-java-1.x/trunk/itest/wsdlless/pom.xml

Modified: tuscany/sca-java-1.x/trunk/itest/wsdlgen/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/wsdlgen/pom.xml?rev=1027538&r1=1027537&r2=1027538&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/wsdlgen/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/itest/wsdlgen/pom.xml Tue Oct 26 13:16:55 2010
@@ -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>

Modified: tuscany/sca-java-1.x/trunk/itest/wsdlless/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/itest/wsdlless/pom.xml?rev=1027538&r1=1027537&r2=1027538&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/itest/wsdlless/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/itest/wsdlless/pom.xml Tue Oct 26 13:16:55 2010
@@ -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>