Author: veithen
Date: Tue Apr 25 20:49:06 2017
New Revision: 1792656
URL: http://svn.apache.org/viewvc?rev=1792656&view=rev
Log:
Merge r1792650 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/apidocs/pom.xml
axis/axis2/java/core/branches/1_7/modules/transport/testkit/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 25 20:49:06 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650
Modified: axis/axis2/java/core/branches/1_7/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/apidocs/pom.xml?rev=1792656&r1=1792655&r2=1792656&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/apidocs/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/apidocs/pom.xml Tue Apr 25 20:49:06 2017
@@ -273,12 +273,44 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
+ <id>extract-resource-info</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>${project.groupId}</groupId>
+
<artifactId>axis2-transport-testkit</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+
<doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
+
<useStandardDocletOptions>false</useStandardDocletOptions>
+ <show>private</show>
+ <additionalparam>-out
${project.build.directory}/resource-info.dat</additionalparam>
+ </configuration>
+ </execution>
+ <execution>
<id>site-javadoc</id>
<phase>site</phase>
<goals>
<goal>javadoc-no-fork</goal>
</goals>
<configuration>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>${project.groupId}</groupId>
+
<artifactId>axis2-transport-testkit</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
+
<useStandardDocletOptions>true</useStandardDocletOptions>
+ <additionalparam>
+ -resource-info
${project.build.directory}/resource-info.dat
+ </additionalparam>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
<destDir>.</destDir>
</configuration>
Modified: axis/axis2/java/core/branches/1_7/modules/transport/testkit/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/transport/testkit/pom.xml?rev=1792656&r1=1792655&r2=1792656&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/transport/testkit/pom.xml
(original)
+++ axis/axis2/java/core/branches/1_7/modules/transport/testkit/pom.xml Tue Apr
25 20:49:06 2017
@@ -184,58 +184,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>extract-resource-info</id>
- <phase>pre-site</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <docletArtifacts>
- <docletArtifact>
- <groupId>${project.groupId}</groupId>
-
<artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </docletArtifact>
- </docletArtifacts>
-
<doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
-
<useStandardDocletOptions>false</useStandardDocletOptions>
- <show>private</show>
- <additionalparam>-out
${project.build.directory}/resource-info.dat</additionalparam>
- </configuration>
- </execution>
- <execution>
- <id>generate-javadoc</id>
- <phase>site</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <docletArtifacts>
- <docletArtifact>
- <groupId>${project.groupId}</groupId>
-
<artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </docletArtifact>
- </docletArtifacts>
-
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
-
<useStandardDocletOptions>true</useStandardDocletOptions>
- <additionalparam>
- -resource-info
${project.build.directory}/resource-info.dat
- -link http://java.sun.com/j2se/1.5.0/docs/api/
- -link http://java.sun.com/j2ee/1.4/docs/api/
- -link http://ws.apache.org/axis2/1_4_1/api/
- -link
http://ws.apache.org/commons/axiom/apidocs/
- -link http://junit.org/junit/javadoc/3.8.1/
- -link
http://www.eclipse.org/aspectj/doc/released/runtime-api/
- </additionalparam>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
