Merge r1722000 to the 1.6 branch.
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 1e9775a..45ae750 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -280,6 +280,13 @@
</execution>
</executions>
<configuration>
+ <additionalJOption>-J-Xmx256m</additionalJOption>
+ <links>
+ <link>http://docs.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://docs.oracle.com/javaee/5/api/</link>
+ <link>http://ws.apache.org/axiom/apidocs/</link>
+ <link>http://jaxen.org/apidocs/</link>
+ </links>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
diff --git a/pom.xml b/pom.xml
index ea4160f..84573a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1018,17 +1018,6 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
- <configuration>
- <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
- <destDir>api</destDir>
- <additionalJOption>-J-Xmx256m</additionalJOption>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://java.sun.com/javaee/5/docs/api/</link>
- <link>http://jaxen.codehaus.org/apidocs/</link>
- </links>
- <detectOfflineLinks>false</detectOfflineLinks>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
