Merge r1735371 to the 1.6 branch.
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index 36722f4..671b54a 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -232,6 +232,21 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <!-- Disable the Javadoc execution configured by the apache-release profile.
+ The wsdl2code goal adds sources as project source, not project test sources,
+ and that causes problems. Note that we don't need the Javadocs anyway. -->
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>none</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
