diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 13:21:29 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 13:21:29 +0000 |
| commit | d134e274a5a1d44125cb0d815c4732fc496b0284 (patch) | |
| tree | d8a83bcabeff9d62aa9d88f32a7e697514f26691 /sca-java-1.x/trunk/itest | |
| parent | ee1b6ff947601af7e29c436b7e6becf4ffdd134c (diff) | |
Merge r1006270 TUSCANY-3706: Add jaxws-api dependencies to jaxws-maven-plugin configuration
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027540 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/itest')
| -rw-r--r-- | sca-java-1.x/trunk/itest/atom/pom.xml | 8 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml | 23 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml | 23 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml | 32 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/exceptions-cross-binding/pom.xml | 32 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/jaxws/pom.xml | 23 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/itest/wsdlgen/pom.xml | 25 |
7 files changed, 149 insertions, 17 deletions
diff --git a/sca-java-1.x/trunk/itest/atom/pom.xml b/sca-java-1.x/trunk/itest/atom/pom.xml index 67586c7621..7398cb997e 100644 --- a/sca-java-1.x/trunk/itest/atom/pom.xml +++ b/sca-java-1.x/trunk/itest/atom/pom.xml @@ -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> diff --git a/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml index a8250afd18..8731766c23 100644 --- a/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml +++ b/sca-java-1.x/trunk/itest/domainmgr/error/payment/pom.xml @@ -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>
diff --git a/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml index 73df725279..de220ac1a7 100644 --- a/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml +++ b/sca-java-1.x/trunk/itest/domainmgr/transaction/payment/pom.xml @@ -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>
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 9f24f79bd0..aa438552b1 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 @@ -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> 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 070124900d..23305d2066 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 @@ -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> diff --git a/sca-java-1.x/trunk/itest/jaxws/pom.xml b/sca-java-1.x/trunk/itest/jaxws/pom.xml index b98f20035c..aeb4c09367 100644 --- a/sca-java-1.x/trunk/itest/jaxws/pom.xml +++ b/sca-java-1.x/trunk/itest/jaxws/pom.xml @@ -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>
diff --git a/sca-java-1.x/trunk/itest/wsdlgen/pom.xml b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml index b76752ceb1..9360f79cb0 100644 --- a/sca-java-1.x/trunk/itest/wsdlgen/pom.xml +++ b/sca-java-1.x/trunk/itest/wsdlgen/pom.xml @@ -169,7 +169,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> |