From e4e9740d12af981f8acd4869af46cf37a2196376 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 10 Oct 2010 10:56:39 +0000
Subject: TUSCANY-3706: Add jaxws-api dependencies to jaxws-maven-plugin
 configuration

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1006270 13f79535-47bb-0310-9956-ffa450edef68
---
 .../branches/sca-java-1.6.1/itest/atom/pom.xml     |  8 ++++++
 .../itest/domainmgr/error/payment/pom.xml          | 23 ++++++++++++++++
 .../itest/domainmgr/transaction/payment/pom.xml    | 23 ++++++++++++++++
 .../itest/exceptions-cross-binding-ws/pom.xml      | 32 ++++++++++++++++------
 .../itest/exceptions-cross-binding/pom.xml         | 32 ++++++++++++++++------
 .../branches/sca-java-1.6.1/itest/jaxws/pom.xml    | 23 ++++++++++++++++
 .../branches/sca-java-1.6.1/itest/wsdlgen/pom.xml  | 25 ++++++++++++++++-
 .../modules/interface-java-jaxws/pom.xml           |  8 ++++++
 8 files changed, 157 insertions(+), 17 deletions(-)

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
index 5993835365..9484f522c2 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/atom/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
index 9056a8b052..d86e741d24 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/error/payment/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
index 724ada50ac..abe3d43b10 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/domainmgr/transaction/payment/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
index e8b1d3e7a1..d97d8ce093 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
index e8ba142ece..6a2cd72caf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
index 63fbc0c064..804a074dce 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
index ae0d9119bc..b1150145bf 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/itest/wsdlgen/pom.xml
@@ -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>
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
index cfc8456e40..9c90fd32c6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/modules/interface-java-jaxws/pom.xml
@@ -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>
-- 
cgit v1.2.3