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/21 12:15:15 UTC
svn commit: r1721126 - in /axis/axis2/java/core/branches/1_6: ./ apidocs/
apidocs/pom.xml modules/parent/pom.xml pom.xml
Author: veithen
Date: Mon Dec 21 11:15:15 2015
New Revision: 1721126
URL: http://svn.apache.org/viewvc?rev=1721126&view=rev
Log:
Merge r1721075 to the 1.6 branch.
Added:
axis/axis2/java/core/branches/1_6/apidocs/ (props changed)
- copied from r1721075, axis/axis2/java/core/trunk/apidocs/
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/apidocs/pom.xml
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
axis/axis2/java/core/branches/1_6/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 11:15:15 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,1373416,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,167743
2,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
+/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,1373416,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,167743
2,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
Propchange: axis/axis2/java/core/branches/1_6/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 21 11:15:15 2015
@@ -0,0 +1 @@
+target
Modified: axis/axis2/java/core/branches/1_6/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/apidocs/pom.xml?rev=1721126&r1=1721075&r2=1721126&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/apidocs/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/apidocs/pom.xml Mon Dec 21 11:15:15 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.6.4-SNAPSHOT</version>
</parent>
<artifactId>apidocs</artifactId>
<name>Javadoc</name>
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=1721126&r1=1721125&r2=1721126&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 Mon Dec 21 11:15:15 2015
@@ -945,6 +945,12 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6/modules/parent</developerConnection>
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging</url>
+ </site>
+ </distributionManagement>
<build>
<pluginManagement>
<plugins>
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=1721126&r1=1721125&r2=1721126&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/pom.xml Mon Dec 21 11:15:15 2015
@@ -38,6 +38,7 @@
<url>http://issues.apache.org/jira/browse/AXIS2</url>
</issueManagement>
<modules>
+ <module>apidocs</module>
<module>modules/resource-bundle</module> <!-- Must be first in the list! -->
<module>modules/adb</module>
<module>modules/adb-codegen</module>
@@ -459,6 +460,12 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/branches/1_6</developerConnection>
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging</url>
+ </site>
+ </distributionManagement>
<properties>
<!-- This variable is used in some Xdocs and is substituted using Velocity. Note that
we can't use the project.version variable directly because of the dot. See
@@ -472,7 +479,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.10.3</version>
<configuration>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
<destDir>api</destDir>
@@ -523,18 +530,6 @@
</pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>site-javadoc</id>
- <phase>pre-site</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<executions>
@@ -557,6 +552,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</build>
<reporting>