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/06 13:52:00 UTC
svn commit: r1718171 - in /axis/axis2/java/rampart/branches/1_6: ./ pom.xml
Author: veithen
Date: Sun Dec 6 12:52:00 2015
New Revision: 1718171
URL: http://svn.apache.org/viewvc?rev=1718171&view=rev
Log:
Merge r1718160 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 6 12:52:00 2015
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1718171&r1=1718170&r2=1718171&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun Dec 6 12:52:00 2015
@@ -148,14 +148,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <!-- Required by maven-scm-publish-plugin -->
- <skipDeploy>true</skipDeploy>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
@@ -178,6 +170,14 @@
<artifactId>axis2-repo-maven-plugin</artifactId>
<version>${axis2.version}</version>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ <configuration>
+ <!-- Required by maven-scm-publish-plugin -->
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -314,7 +314,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
+ <version>2.8.1</version>
<reportSets>
<reportSet>
<reports>