Author: veithen
Date: Tue Dec 22 00:46:43 2015
New Revision: 1721288
URL: http://svn.apache.org/viewvc?rev=1721288&view=rev
Log:
Merge r1721277-1721286 to the 1.6 branch.
Removed:
axis/axis2/java/core/branches/1_6/modules/all/
axis/axis2/java/core/branches/1_6/modules/samples/eventing/
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/src-assembly.xml
axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml
axis/axis2/java/core/branches/1_6/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 22 00:46:43 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,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-162117
2,1626559,1631608,1649688,1677432,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247
+/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,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1609578,1609866,1621171-162117
2,1626559,1631608,1649688,1677432,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247,1721277-1721286
Modified:
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/src-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/src-assembly.xml?rev=1721288&r1=1721287&r2=1721288&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/src-assembly.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/distribution/src/main/assembly/src-assembly.xml
Tue Dec 22 00:46:43 2015
@@ -41,20 +41,7 @@
<directory>../..</directory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>pom.xml</include>
- <include>etc/**</include>
- <include>modules/**</include>
- <include>legal/**</include>
- <include>release-docs/**</include>
- <include>src/**</include>
- </includes>
-
<excludes>
- <!-- Exclude sources for modules that are not part of the
build -->
- <exclude>modules/all/**</exclude>
- <exclude>modules/rmi/**</exclude>
-
<!-- For PDE support, we need to generate some files outside
of the
target directory. They are removed during the clean
phase, but
we also need to exclude them here. -->
@@ -68,11 +55,6 @@
<exclude>modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/target/**</exclude>
<exclude>modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/target/**</exclude>
- <!-- TODO: not sure what those are for -->
- <exclude>../../modules/samples/eventing/**</exclude>
- <exclude>../../modules/samples/security/**</exclude>
- <exclude>xdocs/**</exclude>
-
<!-- Exclusions from
org.apache.resources:apache-source-release-assembly-descriptor.
Note that they assume that all sources are located under
an "src" directory. This
is not the case for Axis2, which doesn't use the standard
Maven 2 conventions.
Modified: axis/axis2/java/core/branches/1_6/modules/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/pom.xml?rev=1721288&r1=1721287&r2=1721288&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/integration/pom.xml Tue Dec 22
00:46:43 2015
@@ -538,6 +538,12 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml?rev=1721288&r1=1721287&r2=1721288&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml
(original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws-integration/pom.xml Tue Dec
22 00:46:43 2015
@@ -1407,6 +1407,12 @@
</systemProperties>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml?rev=1721288&r1=1721287&r2=1721288&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/osgi-tests/pom.xml Tue Dec 22
00:46:43 2015
@@ -169,6 +169,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/core/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1721288&r1=1721287&r2=1721288&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Tue Dec 22 00:46:43 2015
@@ -1017,10 +1017,7 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <!-- Note: 2.0 seems to have issues with the calculation
of the tag path -->
- <version>2.0-beta-9</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<!-- "clean verify" fails because for OSGi bundles,
there
@@ -1029,6 +1026,7 @@
the dependency from the local repository instead
of the
reactor. -->
<preparationGoals>clean install</preparationGoals>
+ <tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
</plugin>
<plugin>
