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/10 12:56:40 UTC
svn commit: r1006270 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.1:
itest/atom/ itest/domainmgr/error/payment/
itest/domainmgr/transaction/payment/ itest/exceptions-cross-binding-ws/
itest/exceptions-cross-binding/ itest/jaxws/ itest/wsdlgen/ modu...
Author: nash
Date: Sun Oct 10 10:56:39 2010
New Revision: 1006270
URL: http://svn.apache.org/viewvc?rev=1006270&view=rev
Log:
TUSCANY-3706: Add jaxws-api dependencies to jaxws-maven-plugin configuration
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml Sun Oct 10 10:56:39 2010
@@ -165,6 +165,14 @@
<artifactId>jsr250-api</artifactId>
<version>1.0</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>
+ </dependency>
</dependencies>
<executions>
<execution>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml Sun Oct 10 10:56:39 2010
@@ -159,6 +159,29 @@
<groupId>org.codehaus.mojo</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
+ -->
+ <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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>payment</id>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml Sun Oct 10 10:56:39 2010
@@ -159,6 +159,29 @@
<groupId>org.codehaus.mojo</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
+ -->
+ <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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>payment</id>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml Sun Oct 10 10:56:39 2010
@@ -183,7 +183,30 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.12</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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>generate-jaxb</id>
@@ -200,13 +223,6 @@
<packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
<keep>true</keep>
</configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
</plugin>
<!-- SDO Generation -->
<plugin>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml Sun Oct 10 10:56:39 2010
@@ -176,7 +176,30 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.12</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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>generate-jaxb</id>
@@ -193,13 +216,6 @@
<packageName>org.apache.tuscany.sca.test.exceptions.impl.jaxb</packageName>
<keep>true</keep>
</configuration>
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- </dependencies>
</plugin>
<!-- SDO Generation -->
<plugin>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml Sun Oct 10 10:56:39 2010
@@ -161,6 +161,29 @@
<groupId>org.codehaus.mojo</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
+ -->
+ <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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>payment</id>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml Sun Oct 10 10:56:39 2010
@@ -170,7 +170,30 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.12</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>
+ <!-- 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>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>generate-test-sources</phase>
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml?rev=1006270&r1=1006269&r2=1006270&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml Sun Oct 10 10:56:39 2010
@@ -197,6 +197,14 @@
<artifactId>jsr250-api</artifactId>
<version>1.0</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>
+ </dependency>
</dependencies>
<executions>
<execution>