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/exceptions-cross-binding-ws | |
| 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/exceptions-cross-binding-ws')
| -rw-r--r-- | sca-java-1.x/trunk/itest/exceptions-cross-binding-ws/pom.xml | 32 |
1 files changed, 24 insertions, 8 deletions
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> |