summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 13:18:40 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-10-26 13:18:40 +0000
commitee1b6ff947601af7e29c436b7e6becf4ffdd134c (patch)
tree9e8682236f2f72986fa5c280b1e054e541665e90
parent18101df48721ba0d528d35b9b8d2be3c285a6a91 (diff)
Merge r1006269 Replace compile-time dependency on jaxws-rt by jaxws-api
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027539 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml12
-rw-r--r--sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml12
-rw-r--r--sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml12
-rw-r--r--sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml12
4 files changed, 36 insertions, 12 deletions
diff --git a/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
index 07925d9f7c..deea6d743a 100644
--- a/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
@@ -119,9 +119,15 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Added by Simon Nash -->
<dependency>
diff --git a/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
index 35a03571b5..541d8d4410 100644
--- a/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-1.x/trunk/itest/databindings/jaxb-top-down/pom.xml
@@ -127,9 +127,15 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Added by Simon Nash -->
<dependency>
diff --git a/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml
index cea6474664..9f24f79bd0 100644
--- a/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml
@@ -45,9 +45,15 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml
index 17403da0a3..070124900d 100644
--- a/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml
@@ -38,9 +38,15 @@
<dependencies>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>