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/19 18:38:58 UTC
svn commit: r1720956 - in /axis/axis2/java/core/branches/1_6: ./
modules/distribution/ modules/java2wsdl/ modules/parent/
modules/tool/axis2-ant-plugin/ modules/tool/axis2-eclipse-codegen-plugin/
modules/tool/axis2-eclipse-service-plugin/
Author: veithen
Date: Sat Dec 19 17:38:57 2015
New Revision: 1720956
URL: http://svn.apache.org/viewvc?rev=1720956&view=rev
Log:
Merge r1720675 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml
axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 17:38:57 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,168382
7,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675
Modified: axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml Sat Dec 19 17:38:57 2015
@@ -289,8 +289,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>
@@ -299,11 +299,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/branches/1_6/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/java2wsdl/pom.xml Sat Dec 19 17:38:57 2015
@@ -165,8 +165,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>
@@ -174,25 +174,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/branches/1_6/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Sat Dec 19 17:38:57 2015
@@ -1030,9 +1030,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/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-ant-plugin/pom.xml Sat Dec 19 17:38:57 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/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Sat Dec 19 17:38:57 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/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1720956&r1=1720955&r2=1720956&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/tool/axis2-eclipse-service-plugin/pom.xml Sat Dec 19 17:38:57 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>