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 2026/08/07 16:25:18 UTC

(tomcat) branch 9.0.x updated (c5f7e38106 -> 1e0d19a40b)

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

markt-asf pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


    from c5f7e38106 Fix Javadoc indent
     new e5bea43bfa Update for latest Checkstyle version
     new 1e0d19a40b Fix back-port

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 res/checkstyle/checkstyle.xml                             | 12 ++++--------
 res/checkstyle/test-checkstyle.xml                        |  7 +------
 test/org/apache/catalina/ha/session/TestDeltaSession.java |  8 ++++----
 test/org/apache/catalina/session/TestStandardSession.java |  4 ++--
 4 files changed, 11 insertions(+), 20 deletions(-)


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


(tomcat) 01/02: Update for latest Checkstyle version

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e5bea43bfa84c5ba734a9505c02dcc10811e81d9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 7 17:15:58 2026 +0100

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

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index ac79ad7a19..5af33941d6 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -88,19 +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"/>
-        <!-- Disabled. Large number of errors with minimal benefit to be gained by fixing at this time. ~1500 errors -->
-        <property name="checkEmptyJavadoc" value="false"/>
-        <!-- Does not handle HTML tags in {@code ...} correctly -->
-        <property name="checkHtml" value="false"/>
-    </module>
     <!-- ~9000 errors
     <module name="MissingJavadocMethod"/>
     -->
@@ -112,6 +105,9 @@
     <module name="RequireEmptyLineBeforeBlockTagGroup"/>
     -->
     <module name="SingleLineJavadoc"/>
+    <!-- ~1900 errors
+    <module name="SummaryJavadoc"/>
+    -->
 
     <!-- Miscellaneous -->
     <!-- ~5500 errors
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"/>
 


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


(tomcat) 02/02: Fix back-port

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1e0d19a40bb19cc0bf7669beec01f763ed68e2ca
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Aug 7 17:25:05 2026 +0100

    Fix back-port
---
 test/org/apache/catalina/ha/session/TestDeltaSession.java | 8 ++++----
 test/org/apache/catalina/session/TestStandardSession.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/org/apache/catalina/ha/session/TestDeltaSession.java b/test/org/apache/catalina/ha/session/TestDeltaSession.java
index f5e43d1e5d..9b2c6db209 100644
--- a/test/org/apache/catalina/ha/session/TestDeltaSession.java
+++ b/test/org/apache/catalina/ha/session/TestDeltaSession.java
@@ -20,10 +20,10 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import jakarta.servlet.http.HttpSessionBindingEvent;
-import jakarta.servlet.http.HttpSessionBindingListener;
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/org/apache/catalina/session/TestStandardSession.java b/test/org/apache/catalina/session/TestStandardSession.java
index a4990cc471..d9c9ce44f6 100644
--- a/test/org/apache/catalina/session/TestStandardSession.java
+++ b/test/org/apache/catalina/session/TestStandardSession.java
@@ -29,8 +29,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import jakarta.servlet.http.HttpSessionBindingEvent;
-import jakarta.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
 
 import org.junit.Assert;
 import org.junit.Test;


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