From f8c5465677ad42877043e7b1fabb0b885afbfeb7 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 25 Nov 2011 15:31:24 +0000
Subject: Update everywhere that use the jaxws-maven-plugin plugin to use the
 version and config which works for both Java 6 and 7

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1206218 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/testing/itest/async-interactions/pom.xml | 23 +++++++++----------
 .../itest/bpel/helloworld-reference/pom.xml        | 26 +++++++++-------------
 .../trunk/testing/itest/bpel/helloworld/pom.xml    | 26 +++++++++-------------
 .../disablewrapped-app/pom.xml                     | 22 ++++++------------
 .../disablewrapped-test/pom.xml                    | 22 ++++++------------
 .../itest/ws-jaxws/contribution-java-first/pom.xml | 22 ++++++------------
 .../itest/ws-jaxws/contribution-wsdl-first/pom.xml | 22 ++++++------------
 .../testing/itest/ws-jaxws/external-client/pom.xml | 22 ++++++------------
 .../itest/ws-jaxws/external-service/pom.xml        | 22 ++++++------------
 .../ws/contribution-callback-forwardspec/pom.xml   | 22 ++++++------------
 .../ws/contribution-callback-fullspec/pom.xml      | 22 ++++++------------
 .../ws/contribution-callback-promotion/pom.xml     | 22 ++++++------------
 .../testing/itest/ws/contribution-callback/pom.xml | 22 ++++++------------
 .../itest/ws/contribution-doc-lit-wrapped/pom.xml  | 22 ++++++------------
 .../testing/itest/ws/contribution-doc-lit/pom.xml  | 22 ++++++------------
 .../itest/ws/contribution-java-first/pom.xml       | 17 +++++++-------
 .../itest/ws/contribution-reference-target/pom.xml | 22 ++++++------------
 .../testing/itest/ws/contribution-rpc-lit/pom.xml  | 22 ++++++------------
 .../itest/ws/contribution-wsdl-first/pom.xml       | 22 ++++++------------
 .../trunk/testing/itest/ws/external-client/pom.xml | 22 ++++++------------
 .../testing/itest/ws/external-service/pom.xml      | 22 ++++++------------
 21 files changed, 157 insertions(+), 309 deletions(-)

(limited to 'sca-java-2.x/trunk/testing')

diff --git a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
index 3de6afffc6..42f107c1ff 100644
--- a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
@@ -80,22 +80,19 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api http://jira.codehaus.org/browse/MEV-498 -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
+                <configuration>
+                    <target>2.1</target>
+                </configuration>
                 <executions>
                     <execution>
                         <id>wsimport-client</id>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
index efef84de17..ebba086d47 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
@@ -187,25 +187,19 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- 
-                     Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
+                <configuration>
+                    <target>2.1</target>
+                </configuration>
                 <executions>
                     <execution>
                         <id>wsimport</id>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
index dcca2ebec9..3359ae6cf7 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
@@ -114,25 +114,19 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- 
-                     Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
+                <configuration>
+                    <target>2.1</target>
+                </configuration>
                 <executions>
                     <execution>
                         <id>wsimport</id>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
index ed36b5e97f..bd35e462bb 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
@@ -69,23 +69,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>               
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
index a6e1a3ca57..88934296a4 100644
--- a/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
@@ -69,23 +69,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>               
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index df71d906fe..cba18490de 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index 892976cd12..4bd87ed35b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
index d92d8d6fcf..ad5e63dbfa 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
@@ -76,23 +76,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
index 5bbd378626..f4c4cc899e 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
@@ -58,23 +58,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions> 
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index c30e5c00ea..7086592b50 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
index 149151f638..335bcafa49 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
index af21f0e0dd..6f73aad7e9 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
index 4fa4b2a6a3..83fdd40331 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index abc005a413..74fa83e5c2 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
index 59e95a35b4..6abe9cc4c7 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
index 90fb413e20..72568d5930 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
@@ -78,6 +78,13 @@
                 <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
                 <version>2.1</version>
+                <dependencies>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>wsgen1</id>
@@ -98,7 +105,6 @@
                             <goal>wsimport</goal>
                         </goals>
                         <configuration>
-                            <target>2.1</target>
                             <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
                             <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
                             <wsdlFiles>
@@ -109,19 +115,12 @@
                     </execution>                                      
                 </executions>
                 <configuration>
+                    <target>2.1</target>
                     <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
                     <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
                     <verbose>true</verbose>
                     <xnocompile>true</xnocompile>
                 </configuration>
-        <!-- if you want to use a specific version of JAX-WS, you can do so like this -->
-        <dependencies>
-          <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
-            <version>2.2.6-promoted-b10</version>
-          </dependency>
-        </dependencies>
             </plugin>                     
         </plugins>
     </build>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
index adadc42870..cd2f29f1ce 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <!-- execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
index c71cb76b69..f79b71d38a 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
index 10bfadb083..b874f0375b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -75,23 +75,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <!-- execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
index a4c0851e08..7dc0fa5070 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
@@ -65,23 +65,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions>
                     <execution>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
index aea326ef4d..11e6754e0e 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
@@ -58,23 +58,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.jvnet.jax-ws-commons</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.10</version>
-                <!-- Explicitly add the transitive dependencies for jaxws-api
-                     http://jira.codehaus.org/browse/MEV-498
-                -->
+                <version>2.1</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                        <version>1.0-MR1</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>javax.annotation</groupId>
-                        <artifactId>jsr250-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
+                   <dependency>
+                      <groupId>com.sun.xml.ws</groupId>
+                      <artifactId>jaxws-tools</artifactId>
+                      <version>2.2.6-promoted-b10</version>
+                   </dependency>
                 </dependencies>
                 <executions> 
                     <execution>
-- 
cgit v1.2.3