This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2597e76c00 Parameterise Javadoc error/warning config. No longer fail
for warnings.
2597e76c00 is described below
commit 2597e76c00380434e7c4deaa0568c96ea2c237d2
Author: Mark Thomas <[email protected]>
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 37ec79f403..45b6bba1bd 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 c40ee2f16a..b7ab0282ca 100644
--- a/build.xml
+++ b/build.xml
@@ -2209,8 +2209,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}"/>
@@ -2231,8 +2231,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}"/>
@@ -2252,8 +2252,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}"/>
@@ -2273,8 +2273,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}"/>
@@ -2294,8 +2294,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}"/>
@@ -2314,8 +2314,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}"/>
@@ -2334,8 +2334,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: [email protected]
For additional commands, e-mail: [email protected]
