You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/11/25 16:31:28 UTC
svn commit: r1206218 - in /tuscany/sca-java-2.x/trunk/testing/itest:
async-interactions/ bpel/helloworld-reference/ bpel/helloworld/
contribution-doc-lit-disablewrapped/disablewrapped-app/
contribution-doc-lit-disablewrapped/disablewrapped-test/ ws-jax...
Author: antelder
Date: Fri Nov 25 15:31:24 2011
New Revision: 1206218
URL: http://svn.apache.org/viewvc?rev=1206218&view=rev
Log:
Update everywhere that use the jaxws-maven-plugin plugin to use the version and config which works for both Java 6 and 7
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
Modified: tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-app/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/contribution-doc-lit-disablewrapped/disablewrapped-test/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-reference-target/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml?rev=1206218&r1=1206217&r2=1206218&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml Fri Nov 25 15:31:24 2011
@@ -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>