Author: richard.opalka(a)jboss.com Date: 2010-09-24 06:55:06 -0400 (Fri, 24 Sep 2010) New Revision: 13018 Modified: stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switch from AS 600M4 to 600M5 Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/modules/management/pom.xml 2010-09-24 10:55:06 UTC (rev 13018) @@ -61,7 +61,7 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M4</artifactId> + <artifactId>jbossws-jboss600M5</artifactId> <scope>provided</scope> <exclusions> <exclusion> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/modules/server/pom.xml 2010-09-24 10:55:06 UTC (rev 13018) @@ -298,8 +298,8 @@ </artifactItem> <artifactItem> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M4</artifactId> - <version>${jbossws.jboss600M4.version}</version> + <artifactId>jbossws-jboss600M5</artifactId> + <version>${jbossws.jboss600M5.version}</version> <classifier>resources</classifier> <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-09-24 10:55:06 UTC (rev 13018) @@ -516,7 +516,7 @@ <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20100721-M4</jboss.version> + <jboss.version>6.0.0.20100911-M5</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-24 10:55:06 UTC (rev 13018) @@ -22,5 +22,8 @@ # [JBWS-2987] Review JMS integration org/jboss/test/ws/jaxws/samples/jmstransport/** -# [JBAS-8403] excluding test until jboss-web.xml override is fixed +# [JBAS-8363] Virtual host issue in JBossWeb +org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.* + +# [JBAS-8403] jboss-web.xml override have been fixed since AS 600 CR1 org/jboss/test/ws/jaxws/jbws3123/JBWS3123TestCase.* Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/pom.xml 2010-09-24 10:55:06 UTC (rev 13018) @@ -51,7 +51,7 @@ <jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version> <jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version> <jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version> - <jbossws.jboss600M4.version>3.4.0-SNAPSHOT</jbossws.jboss600M4.version> + <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version> <!-- JBWS-2505 --> <!-- START --> <!-- @@ -145,13 +145,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M4</artifactId> - <version>${jbossws.jboss600M4.version}</version> + <artifactId>jbossws-jboss600M5</artifactId> + <version>${jbossws.jboss600M5.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600M4</artifactId> - <version>${jbossws.jboss600M4.version}</version> + <artifactId>jbossws-jboss600M5</artifactId> + <version>${jbossws.jboss600M5.version}</version> <classifier>resources</classifier> <type>zip</type> </dependency> Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/profiles.xml.example 2010-09-24 10:55:06 UTC (rev 13018) @@ -13,7 +13,7 @@ <properties> <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100721-M4/build/target/6.0.0.20100721-M4</jboss600.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100911-M5/build/target/jboss-6.0.0.20100911-M5</jboss600.home> <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-23 12:00:05 UTC (rev 13017) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-24 10:55:06 UTC (rev 13018) @@ -157,7 +157,7 @@ <scope>provided</scope> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss600M4:jar</include> + <include>org.jboss.ws:jbossws-jboss600M5:jar</include> </includes> </dependencySet> <!-- [JBWS-2505] -->