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 2017/07/01 17:36:02 UTC
svn commit: r1800519 - in /axis/axis2/java/core/branches/google-java-format:
./ modules/tool/axis2-wsdl2code-maven-plugin/
modules/tool/axis2-wsdl2code-maven-plugin/src/it/
modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/
modules/tool/axis2-wsd...
Author: veithen
Date: Sat Jul 1 17:36:02 2017
New Revision: 1800519
URL: http://svn.apache.org/viewvc?rev=1800519&view=rev
Log:
Merge latest changes from trunk.
Added:
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/it/
- copied from r1800518, axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/it/
Removed:
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test2/
Modified:
axis/axis2/java/core/branches/google-java-format/ (props changed)
axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/google-java-format/pom.xml
Propchange: axis/axis2/java/core/branches/google-java-format/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 1 17:36:02 2017
@@ -2,3 +2,4 @@
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
/axis/axis2/java/core/branches/AXIS2-5785:1793298-1793391
+/axis/axis2/java/core/trunk:1800516-1800518
Modified: axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1800519&r1=1800518&r2=1800519&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat Jul 1 17:36:02 2017
@@ -140,21 +140,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
@@ -182,22 +167,27 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
+ <artifactId>maven-plugin-plugin</artifactId>
<configuration>
- <filesets>
- <fileset>
- <directory>src/test/test1/target</directory>
- </fileset>
- <fileset>
- <directory>src/test/test2/target</directory>
- </fileset>
- </filesets>
+ <goalPrefix>axis2</goalPrefix>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-plugin-plugin</artifactId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <goalPrefix>axis2</goalPrefix>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
</configuration>
</plugin>
</plugins>
Modified: axis/axis2/java/core/branches/google-java-format/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/google-java-format/pom.xml?rev=1800519&r1=1800518&r2=1800519&view=diff
==============================================================================
--- axis/axis2/java/core/branches/google-java-format/pom.xml (original)
+++ axis/axis2/java/core/branches/google-java-format/pom.xml Sat Jul 1 17:36:02 2017
@@ -529,7 +529,7 @@
<jibx.version>1.3.1</jibx.version>
<log4j.version>1.2.15</log4j.version>
<maven.archiver.version>3.0.2</maven.archiver.version>
- <maven.version>3.0.5</maven.version>
+ <maven.version>3.5.0</maven.version>
<maven.plugin.descriptor.version>2.0.7</maven.plugin.descriptor.version>
<maven.archetype.plugin.version>2.2</maven.archetype.plugin.version>
<plexus.classworlds.version>2.4</plexus.classworlds.version>
@@ -956,7 +956,7 @@
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
- <version>2.1</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>