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 2018/10/23 10:11:38 UTC
svn commit: r1844629 - in /axis/axis2/java/core/trunk:
modules/jaxbri-codegen/pom.xml modules/jaxws-integration/pom.xml
modules/jaxws/pom.xml modules/metadata/pom.xml
modules/samples/jaxws-addressbook/pom.xml pom.xml
Author: veithen
Date: Tue Oct 23 10:11:38 2018
New Revision: 1844629
URL: http://svn.apache.org/viewvc?rev=1844629&view=rev
Log:
Replace jaxb2-maven-plugin with something that works on Java 9.
Modified:
axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
axis/axis2/java/core/trunk/modules/metadata/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml?rev=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri-codegen/pom.xml Tue Oct 23 10:11:38 2018
@@ -98,18 +98,18 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>src/test/wsdl/DocLitBareService.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>src/test/wsdl/DocLitBareService.wsdl</file>
+ </files>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Tue Oct 23 10:11:38 2018
@@ -263,97 +263,91 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<id>xjc-soap11</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/soap11.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/soap11.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/soap11</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-echo</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/echo.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/echo.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/echo</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock1</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock1.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock1.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock1</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock2</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock2.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock2.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock2</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-samplemtom</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/samplemtom.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/samplemtom.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtom</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-greeterTypes</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/greeterTypes.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/greeterTypes.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/greeterTypes</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-ProxyDocLitWrapped</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/ProxyDocLitWrapped.wsdl</file>
+ </files>
<packageName>org.test.proxy.doclitwrapped</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProxyDocLitWrapped</outputDirectory>
</configuration>
@@ -361,26 +355,26 @@
<execution>
<id>xjc-AddNumbers</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/AddNumbers.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/AddNumbers.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbers</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-samplemtomjpeg</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/samplemtomjpeg.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/samplemtomjpeg.wsdl</file>
+ </files>
<packageName>org.apache.axis2.jaxws.sample.mtom1</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtomjpeg</outputDirectory>
</configuration>
@@ -388,13 +382,13 @@
<execution>
<id>xjc-RPCLit</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/RPCLit.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/RPCLit.wsdl</file>
+ </files>
<packageName>org.test.proxy.rpclit</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/RPCLit</outputDirectory>
</configuration>
@@ -402,13 +396,13 @@
<execution>
<id>xjc-RPCLitSWA</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/RPCLitSWA.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/RPCLitSWA.wsdl</file>
+ </files>
<packageName>org.test.proxy.rpclitswa</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/RPCLitSWA</outputDirectory>
</configuration>
@@ -416,117 +410,116 @@
<execution>
<id>xjc-gorilla_dlw</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>src/test/java/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>src/test/java/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/gorilla_dlw</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-SOAP12Echo</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/SOAP12Echo.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/SOAP12Echo.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/SOAP12Echo</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-AddNumbersHandler</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/AddNumbersHandler.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/AddNumbersHandler.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbersHandler</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-HeadersHandler</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/HeadersHandler.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/HeadersHandler.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/HeadersHandler</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-async_doclitwr</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/async_doclitwr.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/async_doclitwr.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/async_doclitwr</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-async_doclitwr2</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/async_doclitwr2.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/async_doclitwr2.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/async_doclitwr2</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-FaultyWebService</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/FaultyWebService.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/FaultyWebService.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/FaultyWebService</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-FaultsService</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/FaultsService.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/FaultsService.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/FaultsService</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-jaxbsource</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/jaxbsource.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/jaxbsource.xsd</file>
+ </files>
<packageName>org.test.dispatch.jaxbsource</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/jaxbsource</outputDirectory>
</configuration>
@@ -534,78 +527,78 @@
<execution>
<id>xjc-doclit_nonwrap</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/doclit_nonwrap.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/doclit_nonwrap.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclit_nonwrap</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-doclitwrap</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/doclitwrap.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/doclitwrap.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclitwrap</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-doclitbare</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/doclitbare.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/doclitbare.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclitbare</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-resourceinjection</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/resourceinjection.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/resourceinjection.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/resourceinjection</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-MessageContext</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/MessageContext.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/MessageContext.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/MessageContext</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-WSDLMultiTests</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/WSDLMultiTests.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/WSDLMultiTests.wsdl</file>
+ </files>
<packageName>multi</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/WSDLMultiTests</outputDirectory>
</configuration>
@@ -613,52 +606,52 @@
<execution>
<id>xjc-rpclitenum</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/rpclitenum.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/rpclitenum.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/rpclitenum</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-rpclitstringarray</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/rpclitstringarray.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/rpclitstringarray.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/rpclitstringarray</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-swamtomservice</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/swamtomservice.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/swamtomservice.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/swamtomservice</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-ProcessDocumentService</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/ProcessDocumentService.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/ProcessDocumentService.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProcessDocumentService</outputDirectory>
</configuration>
</execution>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Tue Oct 23 10:11:38 2018
@@ -233,71 +233,67 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<id>xjc-echo</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/echo.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/echo.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/echo</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock1</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock1.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock1.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock1</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-stock2</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/stock2.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/stock2.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock2</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-samplemtom</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <testSources>
- <testSource>test-resources/xsd/samplemtom.xsd</testSource>
- </testSources>
+ <files>
+ <file>test-resources/xsd/samplemtom.xsd</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtom</outputDirectory>
</configuration>
</execution>
<execution>
<id>xjc-ProxyDocLitWrapped</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/ProxyDocLitWrapped.wsdl</file>
+ </files>
<packageName>org.test.proxy.doclitwrapped</packageName>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProxyDocLitWrapped</outputDirectory>
</configuration>
@@ -305,13 +301,13 @@
<execution>
<id>xjc-AddNumbers</id>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/AddNumbers.wsdl</testSource>
- </testSources>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/AddNumbers.wsdl</file>
+ </files>
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbers</outputDirectory>
</configuration>
</execution>
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=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Tue Oct 23 10:11:38 2018
@@ -201,35 +201,23 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>testXjc</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
- <testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
- </testSources>
- <packageName>org.test.proxy.doclitwrapped</packageName>
+ <schemaLanguage>WSDL</schemaLanguage>
+ <files>
+ <file>test-resources/wsdl/ProxyDocLitWrapped.wsdl</file>
+ </files>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <!-- Work around a problem in jaxb2-maven-plugin which confuses compile sources
- and test sources, causing test sources to be included in the source JAR.
- Should be fixed by https://github.com/mojohaus/jaxb2-maven-plugin/pull/94. -->
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/test/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml?rev=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml Tue Oct 23 10:11:38 2018
@@ -56,18 +56,17 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>xjc</goal>
+ <goal>generate-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <sources>
- <source>src/AddressBookEntry.xsd</source>
- </sources>
+ <files>
+ <file>src/AddressBookEntry.xsd</file>
+ </files>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1844629&r1=1844628&r2=1844629&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Oct 23 10:11:38 2018
@@ -1255,9 +1255,9 @@
<version>0.6.2</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.4</version>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
+ <version>0.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1376,31 +1376,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <!-- Work around AXIS2-5890. The jaxb2-maven-plugin doesn't have an option
- to force regenerating the source, so just clean the stale flag file. -->
- <id>clean-testXjcStaleFlag</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <excludeDefaultDirectories>true</excludeDefaultDirectories>
- <filesets>
- <fileset>
- <directory>${project.build.directory}/jaxb2</directory>
- <includes>
- <include>*-testXjcStaleFlag</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.0</version>