Author: asoldano Date: 2014-02-07 12:07:33 -0500 (Fri, 07 Feb 2014) New Revision: 18315 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 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-3757] Upgrade jaxws-tools-maven-plugin to JBossWS 4.2 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-02-07 17:07:33 UTC (rev 18315) @@ -26,7 +26,7 @@ <!-- Properties --> <properties> - <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> + <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> <getopt.version>1.0.13</getopt.version> <log4j.version>1.2.14</log4j.version> <maven.project.version>2.2.1</maven.project.version> Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2014-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2014-02-07 17:07:33 UTC (rev 18315) @@ -133,6 +133,10 @@ { result.add(s.getFile().getAbsolutePath()); } + else if ("gnu.getopt".equals(s.getGroupId()) && "java-getopt".equals(s.getArtifactId())) + { + result.add(s.getFile().getAbsolutePath()); + } else if ("log4j".equals(s.getGroupId()) && "log4j".equals(s.getArtifactId())) { result.add(s.getFile().getAbsolutePath()); 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-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2014-02-07 17:07:33 UTC (rev 18315) @@ -120,12 +120,12 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.1.0.Final</version> + <version>4.2.3.Final</version> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-factories</artifactId> - <version>4.1.0.Final</version> + <version>4.2.3.Final</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> 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-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2014-02-07 17:07:33 UTC (rev 18315) @@ -88,7 +88,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.1.0.Final</version> + <version>4.2.3.Final</version> <scope>provided</scope> </dependency> <dependency> 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-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2014-02-07 17:07:33 UTC (rev 18315) @@ -95,7 +95,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.1.0.Final</version> + <version>4.2.3.Final</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-02-07 15:18:46 UTC (rev 18314) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2014-02-07 17:07:33 UTC (rev 18315) @@ -94,7 +94,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.1.0.Final</version> + <version>4.2.3.Final</version> </dependency> </dependencies> </project>