diff options
author | Jaikiran Pai <jaikiran@apache.org> | 2022-06-22 07:26:31 -0500 |
---|---|---|
committer | Christopher Chavez <chrischavez@gmx.us> | 2022-06-22 07:29:32 -0500 |
commit | 7d7c06f3f692643e9f2609d0792539bbf29d39ee (patch) | |
tree | 198970ce882ef4d7024f3f0847b98240084ebb88 | |
parent | 48fe7025770457b87036b8ddc1cbb13dbe0f1d61 (diff) | |
download | ant-7d7c06f3f692643e9f2609d0792539bbf29d39ee.tar.gz |
bz-63438 Undo part of commit 67f29ce0c2ad332570c0a1382c79532cee66dce8, to fix broken javadocs target
Backported from 1.10.x: dfeee59cca730e1b1346564bf2fe1bf4a81f9549
-rw-r--r-- | CONTRIBUTORS | 1 | ||||
-rw-r--r-- | WHATSNEW | 5 | ||||
-rw-r--r-- | build.xml | 6 | ||||
-rw-r--r-- | contributors.xml | 4 |
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 @@ -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: -------------- @@ -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> |