Author: alessio.soldano(a)jboss.com Date: 2012-04-26 12:31:41 -0400 (Thu, 26 Apr 2012) New Revision: 16224 Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/transports/http/httpserver/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/client/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/dist/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/endorsed/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/resources/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/server/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/shared-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.0.4.GA/pom.xml Log: Fixing poms Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Add-ons</name> @@ -10,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/transports/http/httpserver/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/addons/transports/http/httpserver/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/client/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/client/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/client/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/dist/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/dist/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/dist/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/endorsed/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/endorsed/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/endorsed/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/resources/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/resources/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/resources/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/server/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/server/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/server/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-spring-tests/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-spring-tests/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Spring Tests</name> @@ -10,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../pom.xml</relativePath> </parent> @@ -92,10 +91,10 @@ </goals> <configuration> <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws" /> + <ant antfile="scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws" /> </tasks> </configuration> </execution> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-tests/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/cxf-tests/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Specific Tests</name> @@ -10,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../pom.xml</relativePath> </parent> @@ -65,10 +64,10 @@ </goals> <configuration> <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws"/> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <ant antfile="scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws" /> + <ant antfile="scripts/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws" /> </tasks> </configuration> </execution> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Testsuite</name> @@ -10,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -756,7 +755,7 @@ <!-- JBossWS Native Core version overwritten by jbossws-native stack install --> <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement> <!-- JBossWS Native Core version available on 712 --> - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.2.GA.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.4.GA.jar</additionalClasspathElement> <!-- JBossWS Native Core version specified through system property --> <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/${jbossws-native-core.filename}</additionalClasspathElement> </additionalClasspathElements> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/shared-tests/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/modules/testsuite/shared-tests/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -1,5 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Agnostic Tests</name> @@ -10,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <relativePath>../pom.xml</relativePath> </parent> @@ -99,14 +98,14 @@ </goals> <configuration> <tasks> - <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="project.version" value="${project.version}"/> + <property name="maven.test.classpath" refid="maven.test.classpath" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="project.version" value="${project.version}" /> <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> - <property name="log4j.output.dir" value="${log4j.output.dir}"/> - <property name="endorsed.dir" value="${project.build.directory}/endorsed"/> - <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + <property name="log4j.output.dir" value="${log4j.output.dir}" /> + <property name="endorsed.dir" value="${project.build.directory}/endorsed" /> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> </configuration> </execution> @@ -117,17 +116,17 @@ </goals> <configuration> <tasks> - <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> - <property name="tests.output.dir" value="${project.build.directory}"/> - <property name="project.version" value="${project.version}"/> - <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/> - <property name="log4j.output.dir" value="${log4j.output.dir}"/> - <property name="endorsed.dir" value="${project.build.directory}/endorsed"/> - <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> - <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> + <property name="maven.test.classpath" refid="maven.test.classpath" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="project.version" value="${project.version}" /> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> + <property name="log4j.output.dir" value="${log4j.output.dir}" /> + <property name="endorsed.dir" value="${project.build.directory}/endorsed" /> + <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> + <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" /> + <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" /> + <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" /> </tasks> </configuration> </execution> @@ -139,13 +138,7 @@ </goals> <configuration> <tasks> - <copy - file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" - tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> + <copy file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml" tofile="${jboss.home}/appclient/configuration/appclient-ws.xml" failonerror="false" verbose="true" overwrite="true" /> </tasks> </configuration> </execution> Modified: stack/cxf/tags/jbossws-cxf-4.0.4.GA/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.0.4.GA/pom.xml 2012-04-26 14:58:05 UTC (rev 16223) +++ stack/cxf/tags/jbossws-cxf-4.0.4.GA/pom.xml 2012-04-26 16:31:41 UTC (rev 16224) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.4.GA</version> <!-- Parent --> <parent>