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:47:51 UTC
svn commit: r1718170 - in /axis/axis2/java/rampart/branches/1_6: ./
apidocs/pom.xml pom.xml
Author: veithen
Date: Sun Dec 6 12:47:51 2015
New Revision: 1718170
URL: http://svn.apache.org/viewvc?rev=1718170&view=rev
Log:
Merge r1718157 and r1718159 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
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:47:51 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
+/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
Modified: axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml?rev=1718170&r1=1718169&r2=1718170&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml Sun Dec 6 12:47:51 2015
@@ -58,6 +58,13 @@
<goal>javadoc</goal>
</goals>
</execution>
+ <execution>
+ <id>dist-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
@@ -95,25 +102,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>dist-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
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=1718170&r1=1718169&r2=1718170&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:47:51 2015
@@ -274,12 +274,9 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <!-- Use the same ID as in org.apache:apache; otherwise, the goal
- will be executed twice when the apache-release profile is
- activated -->
- <id>attach-sources</id>
+ <id>source-jars</id>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
@@ -464,9 +461,6 @@
<name>release</name>
</property>
</activation>
- <modules>
- <module>modules/distribution</module>
- </modules>
<build>
<plugins>
<plugin>
@@ -487,19 +481,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Skip the execution configured in org.apache:apache. We use our own configuration. -->
+ <id>attach-sources</id>
+ <phase>none</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
-
- <profile>
- <!-- Profile that includes all modules. This is handy when using maven-release-plugin
- for anything else than doing a release. -->
- <id>everything</id>
- <modules>
- <module>modules/distribution</module>
- <module>code-coverage</module>
- </modules>
- </profile>
</profiles>
<modules>
@@ -511,8 +508,8 @@
<module>modules/rampart-mar</module>
<module>modules/rampart-trust-mar</module>
<module>modules/rampart-integration</module>
- <!-- Compile sample codes -->
- <module>modules/rampart-samples</module>
+ <module>modules/rampart-samples</module> <!-- Compile sample codes -->
+ <module>modules/distribution</module>
<module>code-coverage</module>
</modules>