This is an automated email from the ASF dual-hosted git repository.
jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new dfeee59 bz-63438 Undo part of commit
6656db28bb79912ec1c744f34affbda53f86e6fd, to fix broken javadocs target
dfeee59 is described below
commit dfeee59cca730e1b1346564bf2fe1bf4a81f9549
Author: Jaikiran Pai <jaiki...@apache.org>
AuthorDate: Fri Jan 10 19:08:14 2020 +0530
bz-63438 Undo part of commit 6656db28bb79912ec1c744f34affbda53f86e6fd, to
fix broken javadocs target
---
CONTRIBUTORS | 1 +
WHATSNEW | 5 +++++
build.xml | 17 +++++++++++++++--
contributors.xml | 4 ++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5a4b73c..a831e8f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -9,6 +9,7 @@ Adrian Nistor
Adrien Grand
Aleksandr Ishutin
Alex Rosen
+Alexander Grund
Alexei Yudichev
Alexey Panchenko
Alexey Solofnenko
diff --git a/WHATSNEW b/WHATSNEW
index 0af7f1d..68dc51f 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -22,6 +22,11 @@ Fixed bugs:
exceptions that happen in @BeforeAll method of a test. This is now fixed.
Bugzilla Report 63850
+ * 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 6071a94..047d459 100644
--- a/build.xml
+++ b/build.xml
@@ -574,6 +574,17 @@
<parsersupports
feature="http://java.sun.com/xml/jaxp/properties/schemaSource"/>
</or>
</condition>
+
+ <!--
+ Java8 introduced a HTML checker 'doclint' which is very strict and breaks
+ the build if there is a HTML error in the JavaDoc.
+ -->
+ <condition
+ property="javadoc.doclint.none"
+ value="-Xdoclint:none"
+ else="">
+ <not><isset property="withDoclint"/></not>
+ </condition>
</target>
<!--
@@ -1541,7 +1552,8 @@
windowtitle="${Name} API"
doctitle="${Name}"
maxmemory="1000M"
- verbose="${javadoc.verbose}">
+ verbose="${javadoc.verbose}"
+ additionalparam="${javadoc.doclint.none}">
<packageset dir="${java.dir}"/>
@@ -1572,7 +1584,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 55941aa..4e88f27 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -67,6 +67,10 @@
<last>Rosen</last>
</name>
<name>
+ <first>Alexander</first>
+ <last>Grund</last>
+ </name>
+ <name>
<first>Alexei</first>
<last>Yudichev</last>
</name>
