You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/03/17 20:06:26 UTC
svn commit: r1735476 - /axis/axis2/java/core/trunk/modules/metadata/pom.xml
Author: veithen
Date: Thu Mar 17 19:06:26 2016
New Revision: 1735476
URL: http://svn.apache.org/viewvc?rev=1735476&view=rev
Log:
AXIS2-5748: Use jaxb2-maven-plugin instead of Ant.
Modified:
axis/axis2/java/core/trunk/modules/metadata/pom.xml
Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=1735476&r1=1735475&r2=1735476&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Thu Mar 17 19:06:26 2016
@@ -66,10 +66,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -205,38 +201,28 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>2.2</version>
<executions>
<execution>
- <id>gen-ts</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <!-- Theres got to be a better way to do this -->
- <property name="schema.source.dir" value="test-resources/xsd" />
- <property name="wsdl.source.dir" value="test-resources/wsdl" />
- <property name="schema.output.base.dir" value="target/schema" />
- <property name="schema.generated.src.dir" value="${schema.output.base.dir}/src" />
- <property name="schema.generated.classes.dir" value="${schema.output.base.dir}/classes" />
- <!-- make the dirs -->
- <mkdir dir="${schema.output.base.dir}" />
- <mkdir dir="${schema.generated.src.dir}" />
- <mkdir dir="${schema.generated.classes.dir}" />
- <!-- Run JAXB schema compiler with designated schemas -->
- <echo>Generating JAX-B classes from XSDs</echo>
- <echo>Generating java from ProxyDocLitWrapped.wsdl</echo>
- <java classname="com.sun.tools.xjc.Driver" fork="true">
- <classpath refid="maven.runtime.classpath" />
- <classpath location="${compiled.classes.dir}" />
- <arg line="-d ${schema.generated.src.dir} -quiet -p org.test.proxy.doclitwrapped -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitWrapped.wsdl" />
- </java>
- </tasks>
- </configuration>
<goals>
- <goal>run</goal>
+ <goal>testXjc</goal>
</goals>
+ <configuration>
+ <sourceType>WSDL</sourceType>
+ <testSources>
+ <testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
+ </testSources>
+ <packageName>org.test.proxy.doclitwrapped</packageName>
+ </configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
<execution>
<id>build-repo</id>
<phase>test-compile</phase>
@@ -260,24 +246,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/schema/src</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>