Author: veithen
Date: Mon May 7 16:16:03 2018
New Revision: 1831107
URL: http://svn.apache.org/viewvc?rev=1831107&view=rev
Log:
Upgrade maven-compiler-plugin and avoid duplicate classes.
Modified:
axis/axis1/java/trunk/axis-ant/pom.xml
axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-ant/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/pom.xml?rev=1831107&r1=1831106&r2=1831107&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Mon May 7 16:16:03 2018
@@ -194,7 +194,7 @@
</allowedFiles>
</fileSet>
<fileSet>
-
<directory>${project.build.directory}/work/test/wsdl/extra</directory>
+
<directory>${project.build.directory}/work/test/wsdl/extra/gen</directory>
<expectedFiles>
<expectedFile>Extra.java</expectedFile> <!-- this is the important one -->
<expectedFile>MyService.java</expectedFile>
Modified: axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml?rev=1831107&r1=1831106&r2=1831107&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml (original)
+++ axis/axis1/java/trunk/axis-ant/src/test/ant/extra/build.xml Mon May 7
16:16:03 2018
@@ -1,10 +1,10 @@
<?xml version="1.0" ?>
<project>
<target name="test">
- <mkdir dir="${project.build.directory}/work/test/wsdl/extra"/>
+ <mkdir dir="${project.build.directory}/work/test/wsdl/extra/gen"/>
<!-- Generate WSDL from java -->
- <java2wsdl
output="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
+ <java2wsdl
output="${project.build.directory}/work/test/wsdl/extra/gen/MyService.wsdl"
className= "test.wsdl.extra.MyService"
extraClasses="test.wsdl.extra.Extra"
namespace="http://test.com/extraClasses";
@@ -14,12 +14,12 @@
</java2wsdl>
<!-- Verify files generated based on everything in WSDL -->
- <wsdl2java
url="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
+ <wsdl2java
url="${project.build.directory}/work/test/wsdl/extra/gen/MyService.wsdl"
output="${project.build.directory}/work"
all="yes"
verbose="no"
testcase="no">
- <mapping namespace="http://test.com/extraClasses";
package="test.wsdl.extra"/>
+ <mapping namespace="http://test.com/extraClasses";
package="test.wsdl.extra.gen"/>
</wsdl2java>
</target>
</project>
Modified: axis/axis1/java/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1831107&r1=1831106&r2=1831107&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Mon May 7 16:16:03 2018
@@ -292,7 +292,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
+ <version>3.7.0</version>
<configuration>
<source>${javaVersion}</source>
<target>${javaVersion}</target>
