(tomcat) branch main updated: Update for latest Checkstyle version

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

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


The following commit(s) were added to refs/heads/main by this push:
     new cc0a0d5540 Update for latest Checkstyle version
cc0a0d5540 is described below

commit cc0a0d55402a579447c58009b825130daae3f9d1
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 7 17:15:58 2026 +0100

    Update for latest Checkstyle version
---
 res/checkstyle/checkstyle.xml      | 10 ++++------
 res/checkstyle/test-checkstyle.xml |  7 +------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 0516ff6c44..ec146fbcf6 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -88,17 +88,12 @@
     <module name="InvalidJavadocPosition"/>
     <module name="JavadocBlockTagLocation"/>
     <module name="JavadocContentLocationCheck"/>
+    <module name="JavadocLeadingAsteriskAlign"/>
     <module name="JavadocMethod">
         <property name="accessModifiers" value="public,protected"/>
     </module>
     <module name="JavadocMissingLeadingAsterisk"/>
     <module name="JavadocMissingWhitespaceAfterAsterisk"/>
-    <module name="JavadocStyle">
-        <!-- Disabled. Large number of errors with minimal benefit to be gained by fixing at this time. ~1600 errors -->
-        <property name="checkFirstSentence" value="false"/>
-        <!-- Does not handle HTML tags in {@code ...} correctly -->
-        <property name="checkHtml" value="false"/>
-    </module>
     <!-- ~5900 errors
     <module name="MissingJavadocMethod"/>
     -->
@@ -110,6 +105,9 @@
     <module name="RequireEmptyLineBeforeBlockTagGroup"/>
     -->
     <module name="SingleLineJavadoc"/>
+    <!-- ~1900 errors
+    <module name="SummaryJavadoc"/>
+    -->
 
     <!-- Miscellaneous -->
     <module name="Indentation">
diff --git a/res/checkstyle/test-checkstyle.xml b/res/checkstyle/test-checkstyle.xml
index 6b2ef6b562..c9884730c3 100644
--- a/res/checkstyle/test-checkstyle.xml
+++ b/res/checkstyle/test-checkstyle.xml
@@ -81,17 +81,12 @@
     <module name="InvalidJavadocPosition"/>
     <module name="JavadocBlockTagLocation"/>
     <module name="JavadocContentLocationCheck"/>
+    <module name="JavadocLeadingAsteriskAlign"/>
     <module name="JavadocMethod">
         <property name="accessModifiers" value="public,protected"/>
     </module>
     <module name="JavadocMissingLeadingAsterisk"/>
     <module name="JavadocMissingWhitespaceAfterAsterisk"/>
-    <module name="JavadocStyle">
-        <property name="checkFirstSentence" value="false"/>
-        <property name="checkEmptyJavadoc" value="false"/>
-        <!-- Does not handle HTML tags in {@code ...} correctly -->
-        <property name="checkHtml" value="false"/>
-    </module>
     <module name="NonEmptyAtclauseDescription"/>
     <module name="SingleLineJavadoc"/>