This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 64084354ae Parameterise Javadoc error/warning config. No longer fail for warnings. 64084354ae is described below commit 64084354ae9588790f43feb96f8ee8e3f82e7234 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Jan 13 17:34:39 2023 +0000 Parameterise Javadoc error/warning config. No longer fail for warnings. --- build.properties.default | 5 +++++ build.xml | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/build.properties.default b/build.properties.default index 8fee63c896..7b2eb13bfc 100644 --- a/build.properties.default +++ b/build.properties.default @@ -58,6 +58,11 @@ test.coverage=false # Note the SpotBugs is LGPL licensed execute.spotbugs=false +# Javadoc - warnings are disabled as they are noisy with Java 18+ and CheckStyle +# works better for Tomcat. +javadoc.failonerror=true +javadoc.failonwarning=false + # ----- Test configuration ----- execute.test.nio=true execute.test.nio2=true diff --git a/build.xml b/build.xml index 7460c756d3..1c263e09f9 100644 --- a/build.xml +++ b/build.xml @@ -2153,8 +2153,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2175,8 +2175,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2196,8 +2196,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2217,8 +2217,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2238,8 +2238,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2258,8 +2258,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. charset="UTF-8" additionalparam="-breakiterator -notimestamp -html5" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> @@ -2278,8 +2278,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. additionalparam="-breakiterator -notimestamp -html5" source="${compile.release}" maxmemory="512m" - failonerror="true" - failonwarning="true"> + failonerror="${javadoc.failonerror}" + failonwarning="${javadoc.failonwarning}"> <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org