Merge pull request #190 from chrstphrchvz/backport-634381.9.x

Backport fix for bz-63438 to 1.9.x

4 files changed, 14 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7005c7562..c51db08fe 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -6,6 +6,7 @@ Adam Sotona
 Adrian Nistor
 Aleksandr Ishutin
 Alex Rosen
+Alexander Grund
 Alexei Yudichev
 Alexey Panchenko
 Alexey Solofnenko
diff --git a/WHATSNEW b/WHATSNEW
index 7991cd4b3..487149a9b 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -22,6 +22,11 @@ Fixed bugs:
    timestamps of files transferred recursively from a server.
    Bugzilla Report 66001
 
+ * Building Ant from source could result in the javadocs target failing if the
+   optional dependencies were missing. This has now been fixed.
+   Bugzilla Report 63438
+
+
 Other changes:
 --------------
 
diff --git a/build.xml b/build.xml
index 56f450a65..3636bf7cc 100644
--- a/build.xml
+++ b/build.xml
@@ -1399,7 +1399,8 @@
              windowtitle="${Name} API"
              doctitle="${Name}"
              maxmemory="1000M"
-             verbose="${javadoc.verbose}">
+             verbose="${javadoc.verbose}"
+             additionalparam="${javadoc.doclint.none}">
 
       <packageset dir="${java.dir}"/>
 
@@ -1430,7 +1431,8 @@
              version="true"
              locale="en"
              windowtitle="${Name} Test Utilities"
-             doctitle="${Name}">
+             doctitle="${Name}"
+             additionalparam="${javadoc.doclint.none}">
 
       <!-- hide some meta information for javadoc -->
       <tag name="pre" description="Precondition:" scope="all"/>
diff --git a/contributors.xml b/contributors.xml
index a62b1d477..8e161bc9e 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -55,6 +55,10 @@
     <last>Rosen</last>
   </name>
   <name>
+    <first>Alexander</first>
+    <last>Grund</last>
+  </name>
+  <name>
     <first>Alexei</first>
     <last>Yudichev</last>
   </name>