Author: asoldano Date: 2014-09-11 12:01:56 -0400 (Thu, 11 Sep 2014) New Revision: 18932 Removed: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml Log: [JBWS-3829] Moving to jbossws-cxf 5 snapshot Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -96,19 +96,6 @@ </configuration> <executions> <execution> - <id>integration-test-native</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <configuration> - <cloneProjectsTo>${project.build.directory}/test-embedded-native</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - </configuration> - </execution> - <execution> <id>integration-test-cxf</id> <goals> <goal>install</goal> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -120,12 +120,12 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-factories</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>testWsConsume</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testEndorse</artifactId> - <packaging>jar</packaging> - <version&gt;@pom.version(a)&lt;/version&gt; - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - <compilerArguments> - <endorseddirs>${basedir}/target/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version&gt;@pom.version(a)&lt;/version&gt; - <configuration> - <target>2.2</target> - <verbose>true</verbose> - <fork>true</fork> - <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.test.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Fourth execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>create-endorsed-dir</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <outputDirectory>${basedir}/target/endorsed</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>2.0.0.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -88,7 +88,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>testProvidedScope</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testProvidedScope</artifactId> - <packaging>jar</packaging> - <version&gt;@pom.version(a)&lt;/version&gt; - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version&gt;@pom.version(a)&lt;/version&gt; - <configuration> - <target>2.1</target> - <verbose>true</verbose> - <fork>true</fork> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.test.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Fourth execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>2.0.0.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -95,7 +95,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> </dependencies> </project> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>testWsConsume</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testWsConsume</artifactId> - <packaging>jar</packaging> - <version&gt;@pom.version(a)&lt;/version&gt; - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version&gt;@pom.version(a)&lt;/version&gt; - <configuration> - <target>2.1</target> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar2</targetPackage> - <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory> - <extension>true</extension> - <fork>true</fork> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - </configuration> - </execution> - <execution> - <id>Forth execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - <fork>true</fork> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -94,7 +94,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> </dependencies> </project> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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>testWsProvide</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testWsProvide</artifactId> - <packaging>jar</packaging> - <version&gt;@pom.version(a)&lt;/version&gt; - - <repositories> - <repository> - <id>JBoss Nexus Repository</id> - <name>JBoss Nexus Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public-jboss/<... - </repository> - </repositories> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version&gt;@pom.version(a)&lt;/version&gt; - <configuration> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - </dependencies> -</project>