[WFLY-4484] Upgrade to JBossWS 5.0.0.CR1

wildfly · Apr 17, 2015 · 9ab506b · 9ab506b
1 parent f017906
commit 9ab506b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 67 deletions.
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -600,6 +600,11 @@
             <artifactId>cxf-services-ws-discovery-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.cxf.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.cxf.xjcplugins</groupId>
             <artifactId>cxf-xjc-boolean</artifactId>

diff --git a/...k/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/...k/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
@@ -68,6 +68,7 @@
         <module name="org.apache.ws.security" />
         <module name="org.jboss.logging" />
         <module name="org.picketbox"/>
+        <module name="org.apache.commons.beanutils"/>
         <module name="org.springframework.spring" optional="true">
           <imports>
             <include path="META-INF"/>

diff --git a/pom.xml b/pom.xml
@@ -193,11 +193,11 @@
         <version.org.jboss.spec.javax.xml.ws.jboss-jaxws-api_2.2_spec>2.0.2.Final</version.org.jboss.spec.javax.xml.ws.jboss-jaxws-api_2.2_spec>
         <version.org.jboss.weld.weld>2.2.10.SP1</version.org.jboss.weld.weld>
         <version.org.jboss.weld.weld-api>2.2.SP4</version.org.jboss.weld.weld-api>
-        <version.org.jboss.ws.api>1.0.3.CR2</version.org.jboss.ws.api>
-        <version.org.jboss.ws.spi>3.0.0.Beta5</version.org.jboss.ws.spi>
-        <version.org.jboss.ws.common>3.0.0.Beta3</version.org.jboss.ws.common>
-        <version.org.jboss.ws.common.tools>1.2.1.CR1</version.org.jboss.ws.common.tools>
-        <version.org.jboss.ws.cxf>5.0.0.Beta3</version.org.jboss.ws.cxf>
+        <version.org.jboss.ws.api>1.0.3.CR4</version.org.jboss.ws.api>
+        <version.org.jboss.ws.spi>3.0.0.CR2</version.org.jboss.ws.spi>
+        <version.org.jboss.ws.common>3.0.0.CR1</version.org.jboss.ws.common>
+        <version.org.jboss.ws.common.tools>1.2.1.CR2</version.org.jboss.ws.common.tools>
+        <version.org.jboss.ws.cxf>5.0.0.CR1</version.org.jboss.ws.cxf>
         <version.org.jboss.ws.jaxws-undertow-httpspi>1.0.1.Final</version.org.jboss.ws.jaxws-undertow-httpspi>
         <version.org.jgroups>3.6.2.Final</version.org.jgroups>
         <version.org.jipijapa>1.0.1.Final</version.org.jipijapa>
@@ -3265,45 +3265,27 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.cxf.xjcplugins</groupId>
-                <artifactId>cxf-xjc-dv</artifactId>
+                <groupId>org.apache.cxf.xjc-utils</groupId>
+                <artifactId>cxf-xjc-runtime</artifactId>
                 <version>${version.org.apache.cxf.xjcplugins}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-asm</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-expression</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-tx</artifactId>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
                     </exclusion>
                     <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-jms</artifactId>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.cxf.xjcplugins</groupId>
+                <artifactId>cxf-xjc-dv</artifactId>
+                <version>${version.org.apache.cxf.xjcplugins}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.cxf.xjcplugins</groupId>
                 <artifactId>cxf-xjc-ts</artifactId>
@@ -3313,38 +3295,6 @@
                         <groupId>commons-lang</groupId>
                         <artifactId>commons-lang</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-asm</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-expression</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-tx</artifactId>
-                    </exclusion>
-                    <exclusion>
-                         <groupId>org.springframework</groupId>
-                         <artifactId>spring-jms</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -6163,6 +6113,12 @@
                 <groupId>org.jboss.ws</groupId>
                 <artifactId>jbossws-spi</artifactId>
                 <version>${version.org.jboss.ws.spi}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.jboss.logging</groupId>
+                        <artifactId>jboss-logging-annotations</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>