Author: asoldano Date: 2014-02-17 09:24:15 -0500 (Mon, 17 Feb 2014) New Revision: 18383 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml Log: Merged revisions 18382 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r18382 | asoldano | 2014-02-17 15:21:46 +0100 (Mon, 17 Feb 2014) | 2 lines [JBWS-3670] Enabling passing test ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.2.x ___________________________________________________________________ Modified: svnmerge-integrated - /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-18274,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18325,18378-18379 + /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-18274,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18325,18378-18379,18382 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:18093,18095-18096,18154,18177-18185,18269,18272,18274,18289,18324-18325,18378-18379 + /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,18274,18289,18324-18325,18378-18379,18382 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 14:21:46 UTC (rev 18382) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/pom.xml 2014-02-17 14:24:15 UTC (rev 18383) @@ -763,9 +763,6 @@ <!-- Manually setup KDC before run this test--> <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - - <!-- # [JBWS-3620]:Enable it after the fix merged to upstream--> - <exclude>org/jboss/test/ws/jaxws/cxf/jbws3670/*TestCase*</exclude> </excludes> </configuration> </plugin>