Author: antelder
Date: Fri Nov 25 12:42:30 2011
New Revision: 1206141
URL: http://svn.apache.org/viewvc?rev=1206141&view=rev
Log:
Update to work with both Java 1.6 and 1.7. I think this looks like what has to
be done to get wsimport and wsgen working from Maven for both java 1.6 and 1.7
- use the latest plugin from org.jvnet.jax-ws-commons, set thewsimport target
to be 2.1, and include a dependency on the latest jaxws-tools
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
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=1206141&r1=1206140&r2=1206141&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 12:42:30 2011
@@ -75,24 +75,9 @@
</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
- -->
- <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>
- </dependencies>
+ <version>2.1</version>
<executions>
<execution>
<id>wsgen1</id>
@@ -113,6 +98,7 @@
<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>
@@ -123,12 +109,19 @@
</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>
