From bca88c432578c2c59a8c620e0e8fdd66912eab58 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 27 Mar 2009 17:45:12 +0000
Subject: Workaround the jaxws-api maven issue (merged from 2.x)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@759285 13f79535-47bb-0310-9956-ffa450edef68
---
 .../modules/interface-java-jaxws/pom.xml           | 43 ++++++++++++++++++----
 1 file changed, 36 insertions(+), 7 deletions(-)

(limited to 'branches/sca-java-1.x/modules')

diff --git a/branches/sca-java-1.x/modules/interface-java-jaxws/pom.xml b/branches/sca-java-1.x/modules/interface-java-jaxws/pom.xml
index 9feaef5f09..0e1dee686d 100644
--- a/branches/sca-java-1.x/modules/interface-java-jaxws/pom.xml
+++ b/branches/sca-java-1.x/modules/interface-java-jaxws/pom.xml
@@ -7,15 +7,15 @@
     * to you under the Apache License, Version 2.0 (the
     * "License"); you may not use this file except in compliance
     * with the License.  You may obtain a copy of the License at
-    * 
+    *
     *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
+    *
     * Unless required by applicable law or agreed to in writing,
     * software distributed under the License is distributed on an
     * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
     * KIND, either express or implied.  See the License for the
     * specific language governing permissions and limitations
-    * under the License.    
+    * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
@@ -64,6 +64,20 @@
             </exclusions>
         </dependency>
 
+        <!-- Explicitly add the transitive dependencies for jaxws-api
+             http://jira.codehaus.org/browse/MEV-498
+         -->
+        <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>
+
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
@@ -159,6 +173,21 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
                 <version>1.9</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>
                 <executions>
                     <execution>
                         <id>wsimport</id>
@@ -178,7 +207,7 @@
                         </configuration>
                     </execution>
 
-                    <!-- 
+                    <!--
                     <execution>
                         <id>wsgen</id>
                         <phase>process-test-classes</phase>
@@ -198,11 +227,11 @@
 
             </plugin>
 
-            <!-- 
+            <!--
             wsimport cannot handle WSDL files without a service/binding element.
-            CXF wsdl2java plugin does support that. I had to override the default 
+            CXF wsdl2java plugin does support that. I had to override the default
             value of wsdlRoot/testWsdlRoot to a non-existent file to avoid NPE -->
-            <!-- 
+            <!--
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-- 
cgit v1.2.3