You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/13 17:39:19 UTC

[tomcat] branch 8.5.x updated: Parameterise Javadoc error/warning config. No longer fail for warnings.

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new b6664f08ef Parameterise Javadoc error/warning config. No longer fail for warnings.
b6664f08ef is described below

commit b6664f08ef4836ee2d0e33dba8563d501297d53e
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 486088f067..6127398fd4 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 b6271ff8e5..f66c834a00 100644
--- a/build.xml
+++ b/build.xml
@@ -1849,8 +1849,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}"/>
@@ -1871,8 +1871,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 refid="tomcat.webservices.classpath"/>
@@ -1893,8 +1893,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 refid="tomcat.webservices.classpath"/>
@@ -1915,8 +1915,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 refid="tomcat.webservices.classpath"/>
@@ -1937,8 +1937,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 refid="tomcat.webservices.classpath"/>
@@ -1958,8 +1958,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}"/>
@@ -1978,8 +1978,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 refid="tomcat.webservices.classpath"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org