Author: asoldano Date: 2014-02-17 06:37:36 -0500 (Mon, 17 Feb 2014) New Revision: 18376 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/ stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml Log: Merged revisions 18093,18325 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r18093 | asoldano | 2013-11-15 14:19:03 +0100 (Fri, 15 Nov 2013) | 2 lines [WFLY-2516] Exclude java.xml.crypto classes from Santuario module exports ....... r18325 | jim.ma | 2014-02-10 04:36:32 +0100 (Mon, 10 Feb 2014) | 1 line [JBWS-3752]:Upgrade to Apache CXF 2.7.10 ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.2.x ___________________________________________________________________ Modified: svnmerge-integrated - /stack/cxf/trunk:1-18082,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289 + /stack/cxf/trunk:1-18082,18093,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18323,18325 Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:18095-18096,18154,18177-18185,18269,18272,18289 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:18093,18095-18096,18154,18177-18185,18269,18272,18289,18325 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-02-17 11:14:26 UTC (rev 18375) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/jboss720/org/apache/santuario/xmlsec/main/module.xml 2014-02-17 11:37:36 UTC (rev 18376) @@ -23,6 +23,11 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> + + <exports> + <exclude path="javax/**"/> + </exports> + <properties> <property name="jboss.api" value="private"/> </properties> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-02-17 11:14:26 UTC (rev 18375) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/resources/src/main/resources/modules/wildfly800/org/apache/santuario/xmlsec/main/module.xml 2014-02-17 11:37:36 UTC (rev 18376) @@ -23,6 +23,11 @@ --> <module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> + + <exports> + <exclude path="javax/**"/> + </exports> + <properties> <property name="jboss.api" value="private"/> </properties> Modified: stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml 2014-02-17 11:14:26 UTC (rev 18375) +++ stack/cxf/branches/jbossws-cxf-4.2.x/pom.xml 2014-02-17 11:37:36 UTC (rev 18376) @@ -68,7 +68,7 @@ <jboss720.version>7.2.0.Final</jboss720.version> <wildfly800.version>8.0.0.Beta2-SNAPSHOT</wildfly800.version> <ejb.api.version>1.0.2.Final</ejb.api.version> - <cxf.version>2.7.7</cxf.version> + <cxf.version>2.7.10</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.6.1</cxf.xjcplugins.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> @@ -99,8 +99,8 @@ <jms.api.version>1.0.1.Final</jms.api.version> <velocity.version>1.7</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.5.5</xmlsec.version> - <wss4j.version>1.6.12</wss4j.version> + <xmlsec.version>1.5.6</xmlsec.version> + <wss4j.version>1.6.14</wss4j.version> <wstx.version>4.2.0</wstx.version> <spring.version>3.0.7.RELEASE</spring.version> <shrinkwrap.version>1.1.3</shrinkwrap.version>