Author: veithen
Date: Tue Dec 8 20:08:48 2015
New Revision: 1718687
URL: http://svn.apache.org/viewvc?rev=1718687&view=rev
Log:
Merge r1718682 to the 1.6 branch.
Added:
axis/axis2/java/rampart/branches/1_6/apidocs/src/
- copied from r1718682, axis/axis2/java/rampart/trunk/apidocs/src/
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/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 8 20:08:48 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-1718160,1718174-1718175,1718198,1718225,1718231-1718232
+/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,1718174-1718175,1718198,1718225,1718231-1718232,1718682
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=1718687&r1=1718686&r2=1718687&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml Tue Dec 8 20:08:48
2015
@@ -49,26 +49,30 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<executions>
<execution>
<id>site-javadoc</id>
<phase>site</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>javadoc-no-fork</goal>
</goals>
+ <configuration>
+
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+ <destDir>.</destDir>
+ </configuration>
</execution>
<execution>
<id>dist-javadoc</id>
<phase>package</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>javadoc-no-fork</goal>
</goals>
+ <configuration>
+
<reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
+ </configuration>
</execution>
</executions>
<configuration>
-
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
- <destDir>.</destDir>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
@@ -86,6 +90,22 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/apidocs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-site-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml?rev=1718687&r1=1718686&r2=1718687&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml Tue Dec
8 20:08:48 2015
@@ -38,13 +38,17 @@
<include>org.owasp.esapi:esapi:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
+ <includes>
+ <include>*:apidocs:zip:javadoc</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>../../apidocs/target/site</directory>
- <outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
- </fileSet>
- <fileSet>
<directory>../rampart-samples</directory>
<outputDirectory>${dist.dir}/samples</outputDirectory>
</fileSet>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1718687&r1=1718686&r2=1718687&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Tue Dec
8 20:08:48 2015
@@ -123,6 +123,13 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apidocs</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <type>zip</type>
+ </dependency>
</dependencies>
</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=1718687&r1=1718686&r2=1718687&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Tue Dec 8 20:08:48 2015
@@ -185,6 +185,14 @@
<skipDeploy>true</skipDeploy>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
