Author: alessio.soldano(a)jboss.com Date: 2011-12-15 18:15:03 -0500 (Thu, 15 Dec 2011) New Revision: 15398 Removed: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 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/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.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/testEndorse/pom.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/testWsConsume/pom.xml 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.xml Log: [JBWS-3400] Moving plugin to JBossWS-CXF 4.0.0.CR1 / JBossWS-Native 4.0.0.CR2 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -7,7 +7,7 @@ <artifactId>maven-jaxws-tools-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <!-- Parent --> <parent> @@ -25,7 +25,9 @@ <!-- Properties --> <properties> - <jbossws.spi.version>1.4.0.CR1</jbossws.spi.version> + <jbossws.common.tools.version>1.0.0.CR1</jbossws.common.tools.version> + <getopt.version>1.0.13</getopt.version> + <log4j.version>1.2.14</log4j.version> <maven.project.version>2.0.11</maven.project.version> <maven.plugin.api.version>2.0.4</maven.plugin.api.version> <maven.invoker.plugin.version>1.5</maven.invoker.plugin.version> @@ -38,10 +40,20 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws.spi.version}</version> + <artifactId>jbossws-common-tools</artifactId> + <version>${jbossws.common.tools.version}</version> </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + <version>${getopt.version}</version> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${maven.project.version}</version> @@ -117,19 +129,6 @@ </pomIncludes> </configuration> </execution> - <execution> - <id>integration-test-metro</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <configuration> - <cloneProjectsTo>${project.build.directory}/test-embedded-metro</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom-metro.xml</pomInclude> - </pomIncludes> - </configuration> - </execution> </executions> </plugin> <plugin> 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -25,8 +25,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.List; +import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.project.MavenProject; @@ -81,6 +83,8 @@ */ public abstract List<String> getClasspathElements(); + public abstract List<Artifact> getPluginArtifacts(); + /** * Update the current Maven project source roots with the generated classes / resources */ @@ -104,6 +108,36 @@ } return new URLClassLoader(urls, null); } + + /** + * Return the plugin dependencies that are required to actually call the tools + * (jbossws-common-tools and his transitive dependencies getopt and log4j) + //at the *end* of the list, add the required plugin dependency + //that do not come in from the stack dependency tree because: + //1) jbossws-common-tools is not a required dep for stack clients + //2) log4j and getopt need to be provided scope deps, hence are not transitive + * + * @return a list with the required plugin dependencies + */ + protected List<String> getRequiredPluginDependencyPaths() + { + List<String> result = new ArrayList<String>(3); + for (Artifact s : getPluginArtifacts()) { + if ("org.jboss.ws".equals(s.getGroupId()) && "jbossws-common-tools".equals(s.getArtifactId())) + { + result.add(s.getFile().getAbsolutePath()); + } + else if ("gnu-getopt".equals(s.getGroupId()) && "getopt".equals(s.getArtifactId())) + { + result.add(s.getFile().getAbsolutePath()); + } + else if ("log4j".equals(s.getGroupId()) && "log4j".equals(s.getArtifactId())) + { + result.add(s.getFile().getAbsolutePath()); + } + } + return result; + } public Boolean getExtension() { Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -27,6 +27,7 @@ import java.util.LinkedList; import java.util.List; +import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; @@ -140,6 +141,10 @@ params.setWsdlLocation(wsdlLocation); params.setArgLine(argLine); params.setFork(fork); + if (fork) + { + params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths()); + } WSContractDelegate delegate = new WSContractDelegate(getLog()); for (String wsdl : wsdls) Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -101,6 +101,10 @@ params.setSourceDirectory(sourceDirectory); params.setFork(fork); params.setArgLine(argLine); + if (fork) + { + params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths()); + } WSContractDelegate delegate = new WSContractDelegate(getLog()); delegate.runProvider(params); Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -24,6 +24,8 @@ import java.io.File; import java.util.List; +import org.apache.maven.artifact.Artifact; + /** * Run wsconsume tool (for tests) * @@ -52,6 +54,15 @@ * @readonly */ protected List<String> testClasspathElements; + + /** + * + * + * @parameter default-value="${plugin.artifacts}" + * @required + * @readonly + */ + private List<Artifact> pluginArtifacts; @Override public File getOutputDirectory() @@ -70,4 +81,10 @@ { project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath()); } + + @Override + public List<Artifact> getPluginArtifacts() + { + return pluginArtifacts; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/TestWsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -24,6 +24,8 @@ import java.io.File; import java.util.List; +import org.apache.maven.artifact.Artifact; + /** * Runs wsprovide tool (for tests) * @@ -53,6 +55,15 @@ */ protected List<String> testClasspathElements; + /** + * + * + * @parameter default-value="${plugin.artifacts}" + * @required + * @readonly + */ + private List<Artifact> pluginArtifacts; + @Override public File getOutputDirectory() { @@ -70,4 +81,10 @@ { project.addTestCompileSourceRoot(sourceDirectory.getAbsolutePath()); } + + @Override + public List<Artifact> getPluginArtifacts() + { + return pluginArtifacts; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -22,12 +22,13 @@ package org.jboss.ws.plugins.tools; import java.io.File; +import java.net.URLClassLoader; import java.util.List; public class WSContractConsumerParams { private boolean fork; - private ClassLoader loader; + private URLClassLoader loader; private List<String> additionalCompilerClassPath; private List<String> bindingFiles; private File catalog; @@ -41,7 +42,16 @@ private String targetPackage; private String wsdlLocation; private String argLine; + private List<String> additionalPluginDependencies; + public List<String> getAdditionalPluginDependencies() + { + return additionalPluginDependencies; + } + public void setAdditionalPluginDependencies(List<String> additionalPluginDependencies) + { + this.additionalPluginDependencies = additionalPluginDependencies; + } public boolean isAdditionalHeaders() { return additionalHeaders; @@ -66,11 +76,11 @@ { return fork; } - public void setLoader(ClassLoader loader) + public void setLoader(URLClassLoader loader) { this.loader = loader; } - public ClassLoader getLoader() + public URLClassLoader getLoader() { return loader; } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -59,7 +59,7 @@ private void runProviderInProcess(WSContractProviderParams params) throws Exception { ClassLoader loader = params.getLoader(); - Class<?> providerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractProvider"); + Class<?> providerClass = loader.loadClass("org.jboss.ws.api.tools.WSContractProvider"); Object provider = providerClass.getMethod("newInstance").invoke(null); setupProvider(providerClass, provider, params); Method m = providerClass.getMethod("provide", new Class<?>[]{String.class}); @@ -74,7 +74,8 @@ { classpath.add(url.getFile()); } - List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.wsf.spi.tools.cmd.WSProvide"); + classpath.addAll(params.getAdditionalPluginDependencies()); + List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSProvide"); String commandLine = getProviderCommandLine(commandList, params); if (log.isDebugEnabled()) @@ -107,7 +108,7 @@ private void runConsumerInProcess(WSContractConsumerParams params, String wsdl) throws Exception { ClassLoader loader = params.getLoader(); - Class<?> consumerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractConsumer"); + Class<?> consumerClass = loader.loadClass("org.jboss.ws.api.tools.WSContractConsumer"); Object consumer = consumerClass.getMethod("newInstance").invoke(null); setupConsumer(consumerClass, consumer, params); Method m = consumerClass.getMethod("consume", new Class<?>[]{String.class}); @@ -116,7 +117,14 @@ private void runConsumerOutOfProcess(WSContractConsumerParams params, String wsdl) throws Exception { - List<String> commandList = initCommandList(params.getArgLine(), params.getAdditionalCompilerClassPath(), "org.jboss.wsf.spi.tools.cmd.WSConsume"); + List<String> classpath = new LinkedList<String>(); + URL[] urls = params.getLoader().getURLs(); + for (URL url : urls) + { + classpath.add(url.getFile()); + } + classpath.addAll(params.getAdditionalPluginDependencies()); + List<String> commandList = initCommandList(params.getArgLine(), classpath, "org.jboss.ws.tools.cmd.WSConsume"); String commandLine = getConsumerCommandLine(commandList, params, wsdl); if (log.isDebugEnabled()) Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -23,6 +23,7 @@ import java.io.File; import java.net.URLClassLoader; +import java.util.List; public class WSContractProviderParams { @@ -36,7 +37,16 @@ private File resourceDirectory; private File sourceDirectory; private String argLine; + private List<String> additionalPluginDependencies; + public List<String> getAdditionalPluginDependencies() + { + return additionalPluginDependencies; + } + public void setAdditionalPluginDependencies(List<String> additionalPluginDependencies) + { + this.additionalPluginDependencies = additionalPluginDependencies; + } public boolean isFork() { return fork; Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsConsumeMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -24,6 +24,8 @@ import java.io.File; import java.util.List; +import org.apache.maven.artifact.Artifact; + /** * Runs wsconsume tool * @@ -53,6 +55,15 @@ */ protected List<String> classpathElements; + /** + * + * + * @parameter default-value="${plugin.artifacts}" + * @required + * @readonly + */ + private List<Artifact> pluginArtifacts; + @Override protected void updateProjectSourceRoots() { @@ -70,4 +81,10 @@ { return classpathElements; } + + @Override + public List<Artifact> getPluginArtifacts() + { + return pluginArtifacts; + } } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WsProvideMojo.java 2011-12-15 23:15:03 UTC (rev 15398) @@ -24,6 +24,8 @@ import java.io.File; import java.util.List; +import org.apache.maven.artifact.Artifact; + /** * Runs wsprovide tool * @@ -52,6 +54,15 @@ * @readonly */ protected List<String> classpathElements; + + /** + * + * + * @parameter default-value="${plugin.artifacts}" + * @required + * @readonly + */ + private List<Artifact> pluginArtifacts; @Override protected void updateProjectSourceRoots() @@ -70,4 +81,10 @@ { return classpathElements; } + + @Override + public List<Artifact> getPluginArtifacts() + { + return pluginArtifacts; + } } 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -120,17 +120,23 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR1</version> + <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that prevents junit from leaking into the dependency tree --> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-factories</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR1</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>1.0.0.Beta1</version> + <version>2.0.0.Final</version> </dependency> </dependencies> </project> Modified: 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -115,12 +115,12 @@ <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR2</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>1.0.0.Beta1</version> + <version>2.0.0.Final</version> </dependency> <dependency> <groupId>org.jboss</groupId> 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -95,7 +95,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR1</version> </dependency> </dependencies> </project> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-metro.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -1,101 +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.0.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>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.metro</groupId> - <artifactId>jbossws-metro-client</artifactId> - <version>3.3.1.GA</version> - </dependency> - </dependencies> -</project> Modified: 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -96,7 +96,7 @@ <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR2</version> </dependency> <dependency> <groupId>org.jboss</groupId> 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -71,7 +71,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR1</version> + <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that prevents junit from leaking into the dependency tree --> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> Modified: 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 2011-12-15 16:56:37 UTC (rev 15397) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-15 23:15:03 UTC (rev 15398) @@ -76,7 +76,7 @@ <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-client</artifactId> - <version>3.4.0.CR1</version> + <version>4.0.0.CR2</version> </dependency> </dependencies> </project>