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 2015/12/17 23:11:01 UTC
svn commit: r1720675 - in /axis/axis2/java/core/trunk/modules:
distribution/pom.xml java2wsdl/pom.xml parent/pom.xml
tool/axis2-ant-plugin/pom.xml tool/axis2-eclipse-codegen-plugin/pom.xml
tool/axis2-eclipse-service-plugin/pom.xml
Author: veithen
Date: Thu Dec 17 22:11:00 2015
New Revision: 1720675
URL: http://svn.apache.org/viewvc?rev=1720675&view=rev
Log:
Upgrade from gmaven-plugin to gmavenplus-plugin.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Thu Dec 17 22:11:00 2015
@@ -315,8 +315,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>generate-timestamp</id>
@@ -325,11 +325,13 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['buildTimestamp'] = MessageFormat.format("{0,date,dd-MM-yyyy}", new Date())
- </source>
+ <scripts>
+ <script>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['buildTimestamp'] = MessageFormat.format("{0,date,dd-MM-yyyy}", new Date())
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Thu Dec 17 22:11:00 2015
@@ -189,8 +189,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<phase>test</phase>
@@ -198,25 +198,27 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import groovy.xml.*
-
- if (project.properties['maven.test.skip']) {
- println 'Tests are skipped'
- return
- }
-
- def parser = new XmlParser()
- def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/')
- def xs = new Namespace('http://www.w3.org/2001/XMLSchema')
-
- println 'Checking p2n.wsdl'
-
- def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/p2n.wsdl"))
- def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
- assert namespaces.contains('http://www.example.org/calculator')
- assert namespaces.contains('http://www.example.org/calculator-service')
- </source>
+ <scripts>
+ <script>
+ import groovy.xml.*
+
+ if (project.properties['maven.test.skip']) {
+ println 'Tests are skipped'
+ return
+ }
+
+ def parser = new XmlParser()
+ def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/')
+ def xs = new Namespace('http://www.w3.org/2001/XMLSchema')
+
+ println 'Checking p2n.wsdl'
+
+ def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/p2n.wsdl"))
+ def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+ assert namespaces.contains('http://www.example.org/calculator')
+ assert namespaces.contains('http://www.example.org/calculator-service')
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Thu Dec 17 22:11:00 2015
@@ -1068,9 +1068,16 @@
<version>1.4</version>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.5</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.4.4</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Thu Dec 17 22:11:00 2015
@@ -154,8 +154,8 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<phase>test</phase>
@@ -163,34 +163,36 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import groovy.xml.*
-
- if (project.properties['maven.test.skip']) {
- println 'Tests are skipped'
- return
- }
-
- def parser = new XmlParser()
- def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/')
- def xs = new Namespace('http://www.w3.org/2001/XMLSchema')
-
- println 'Checking extraclasses*.wsdl'
-
- for (i in 1..3) {
- def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl"))
- def complexTypes = wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name'
- assert complexTypes.contains('ExtraClass1')
- assert complexTypes.contains('ExtraClass2')
- }
-
- println 'Checking mappings.wsdl'
-
- def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/mappings.wsdl"))
- def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
- assert namespaces.contains('http://www.example.org/schema/test-service')
- assert namespaces.contains('http://www.example.org/schema/test')
- </source>
+ <scripts>
+ <script>
+ import groovy.xml.*
+
+ if (project.properties['maven.test.skip']) {
+ println 'Tests are skipped'
+ return
+ }
+
+ def parser = new XmlParser()
+ def wsdl = new Namespace('http://schemas.xmlsoap.org/wsdl/')
+ def xs = new Namespace('http://www.w3.org/2001/XMLSchema')
+
+ println 'Checking extraclasses*.wsdl'
+
+ for (i in 1..3) {
+ def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl"))
+ def complexTypes = wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name'
+ assert complexTypes.contains('ExtraClass1')
+ assert complexTypes.contains('ExtraClass2')
+ }
+
+ println 'Checking mappings.wsdl'
+
+ def wsdlDoc = parser.parse(new File(project.build.directory, "java2wsdl/mappings.wsdl"))
+ def namespaces = wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+ assert namespaces.contains('http://www.example.org/schema/test-service')
+ assert namespaces.contains('http://www.example.org/schema/test')
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Dec 17 22:11:00 2015
@@ -201,8 +201,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>extract-bundle-symbolicname-and-version</id>
@@ -211,13 +211,15 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.util.jar.Manifest
-
- Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
- project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
- project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version")
- </source>
+ <scripts>
+ <script>
+ import java.util.jar.Manifest
+
+ Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
+ project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
+ project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version")
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1720675&r1=1720674&r2=1720675&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Dec 17 22:11:00 2015
@@ -178,8 +178,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
<executions>
<execution>
<id>extract-bundle-symbolicname-and-version</id>
@@ -188,13 +188,15 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- import java.util.jar.Manifest
-
- Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
- project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
- project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version")
- </source>
+ <scripts>
+ <script>
+ import java.util.jar.Manifest
+
+ Manifest manifest = new Manifest(new FileInputStream(new File(project.basedir, "META-INF/MANIFEST.MF")))
+ project.properties["bundle-symbolic-name"] = manifest.mainAttributes.getValue("Bundle-SymbolicName").find("^[^;]*")
+ project.properties["bundle-version"] = manifest.mainAttributes.getValue("Bundle-Version")
+ </script>
+ </scripts>
</configuration>
</execution>
</executions>