[AS7-3797] Upgrade to jbossws 4.0.2 / wss4j 1.6.5 / santuario 1.5.1

dpospisil · Mar 5, 2012 · 13565b6 · 13565b6
1 parent 8ca069c
commit 13565b6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -863,7 +863,7 @@
 
         <module-def name="org.jboss.as.webservices">
             <maven-resource group="org.jboss.as" artifact="jboss-as-webservices-server-integration"/>
-            <maven-resource-with-classifier group="org.jboss.ws.cxf" artifact="jbossws-cxf-resources" classifier="jboss700"/>
+            <maven-resource-with-classifier group="org.jboss.ws.cxf" artifact="jbossws-cxf-resources" classifier="jboss711"/>
         </module-def>
 
         <module-def name="org.jboss.as.webservices.server.integration">

diff --git a/build/pom.xml b/build/pom.xml
@@ -1521,7 +1521,7 @@
                 <dependency>
                     <groupId>org.jboss.ws.cxf</groupId>
                     <artifactId>jbossws-cxf-resources</artifactId>
-                    <classifier>jboss700</classifier>
+                    <classifier>jboss711</classifier>
                 </dependency>
 
                 <dependency>

diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
@@ -37,6 +37,8 @@
         <module name="javax.xml.bind.api" export="true"/>
         <module name="com.sun.xml.bind" export="true" services="export"/>
         <module name="javax.xml.ws.api" />
+        <!-- WSDL4J API -->
+        <module name="javax.wsdl4j.api" export="true"/>
         <!-- JBossWS API -->
         <module name="org.jboss.ws.api" export="true" />
         <!--  JBossWS JAXWS client -->

diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
@@ -40,7 +40,6 @@
         <module name="javax.xml.bind.api" />
         <module name="javax.xml.stream.api" />
         <module name="javax.xml.ws.api" />
-        <module name="org.picketbox" />
         <module name="org.jboss.ws.api" />
         <module name="org.jboss.ws.spi" />
         <module name="org.jboss.ws.common" />

diff --git a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
@@ -47,7 +47,7 @@
         <module name="javax.xml.ws.api" />
         <module name="org.picketbox"/>
         <module name="org.apache.xerces" services="import"/>
-        <module name="org.apache.xmlsec" optional="true"/>
+        <module name="org.apache.santuario.xmlsec" optional="true"/>
         <module name="org.apache.ws.commons.policy" optional="true"/>
         <module name="org.javassist" />
         <module name="org.codehaus.jettison" optional="true"/>

diff --git a/pom.xml b/pom.xml
@@ -117,10 +117,10 @@
         <version.org.apache.httpcomponents.httpcore>4.1.4</version.org.apache.httpcomponents.httpcore>
         <version.org.apache.neethi>3.0.1</version.org.apache.neethi>
         <version.org.apache.openjpa>2.1.1</version.org.apache.openjpa>
-        <version.org.apache.santuario>1.4.5</version.org.apache.santuario>
+        <version.org.apache.santuario>1.5.1</version.org.apache.santuario>
         <version.org.apache.velocity>1.6.3</version.org.apache.velocity>
         <version.org.apache.ws.scout>1.1.1</version.org.apache.ws.scout>
-        <version.org.apache.ws.security>1.6.4</version.org.apache.ws.security>
+        <version.org.apache.ws.security>1.6.5</version.org.apache.ws.security>
         <version.org.apache.ws.xmlschema>2.0</version.org.apache.ws.xmlschema>
         <version.org.apache.xalan>2.7.1.jbossorg-1</version.org.apache.xalan>
         <version.org.apache.xerces>2.9.1-jbossas-1</version.org.apache.xerces>
@@ -219,12 +219,12 @@
         <version.org.jboss.weld.weld>1.1.5.AS71.Final</version.org.jboss.weld.weld>
         <version.org.jboss.weld.weld-api>1.1.Final</version.org.jboss.weld.weld-api>
         <version.org.jboss.ws.api>1.0.0.GA</version.org.jboss.ws.api>
-        <version.org.jboss.ws.common>2.0.1.GA</version.org.jboss.ws.common>
+        <version.org.jboss.ws.common>2.0.2.GA</version.org.jboss.ws.common>
         <version.org.jboss.ws.common.tools>1.0.0.GA</version.org.jboss.ws.common.tools>
-        <version.org.jboss.ws.jbossws-cxf>4.0.1.GA</version.org.jboss.ws.jbossws-cxf>
-        <version.org.jboss.ws.jbossws-native>4.0.1.GA</version.org.jboss.ws.jbossws-native>
-        <version.org.jboss.ws.spi>2.0.2.GA</version.org.jboss.ws.spi>
-        <version.org.jboss.ws.jaxws-jboss-httpserver-httpspi>1.0.0.GA</version.org.jboss.ws.jaxws-jboss-httpserver-httpspi>
+        <version.org.jboss.ws.jbossws-cxf>4.0.2.GA</version.org.jboss.ws.jbossws-cxf>
+        <version.org.jboss.ws.jbossws-native>4.0.2.GA</version.org.jboss.ws.jbossws-native>
+        <version.org.jboss.ws.spi>2.0.3.GA</version.org.jboss.ws.spi>
+        <version.org.jboss.ws.jaxws-jboss-httpserver-httpspi>1.0.1.GA</version.org.jboss.ws.jaxws-jboss-httpserver-httpspi>
         <version.org.jboss.xb>2.0.3.GA</version.org.jboss.xb>
         <version.org.jboss.xnio>3.0.3.GA</version.org.jboss.xnio>
         <version.org.jboss.xnio.xnio-api>${version.org.jboss.xnio}</version.org.jboss.xnio.xnio-api>
@@ -5292,7 +5292,7 @@
             <dependency>
                 <groupId>org.jboss.ws.cxf</groupId>
                 <artifactId>jbossws-cxf-resources</artifactId>
-                <classifier>jboss700</classifier>
+                <classifier>jboss711</classifier>
                 <version>${version.org.jboss.ws.jbossws-cxf}</version>
             </dependency>