[jbossws-commits] JBossWS SVN: r15783 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite and 1 other directories.

Author: ropalka Date: 2012-02-29 01:25:47 -0500 (Wed, 29 Feb 2012) New Revision: 15783 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15780-15781 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15780 | ropalka | 2012-02-29 07:14:34 +0100 (Wed, 29 Feb 2012) | 1 line sync. with AS7 upstream ....... r15781 | ropalka | 2012-02-29 07:16:48 +0100 (Wed, 29 Feb 2012) | 1 line fix build failure ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-02-29 06:20:58 UTC (rev 15782) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2012-02-29 06:25:47 UTC (rev 15783) @@ -102,14 +102,6 @@ </manifest> </war> - <!-- jaxws-cxf-interop-wstrust10-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-interop-wstrust10-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/interop/wstrust10/META-INF"> - <include name="**/*" /> - </metainf> - </jar> - - <!-- jaxws-cxf-mixtype --> <!-- jaxws-cxf-mixtype--> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-mixtype.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/mixtype/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-29 06:20:58 UTC (rev 15782) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-29 06:25:47 UTC (rev 15783) @@ -1240,9 +1240,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.remoting3</groupId> + <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> - <version>1.0.1.Final</version> + <version>1.0.2.Final</version> <scope>test</scope> </dependency> <dependency>