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

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


The following commit(s) were added to refs/heads/11.0.x by this push:
     new 6c5cd02cb5 Move changelog entries to the version in which they were 
first added
6c5cd02cb5 is described below

commit 6c5cd02cb5b501bfa087cf00b6b623f29aa85cff
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Nov 10 17:37:27 2026 +0000

    Move changelog entries to the version in which they were first added
    
    Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
---
 webapps/docs/changelog.xml | 72 ++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a3a2b578bc..911c86de2c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -2722,6 +2722,13 @@
       <update>
         Update the minimum version for Tomcat Native 1.x to 1.3.8. (markt)
       </update>
+      <fix>
+        Update <code>StoreRegistry</code> to dynamically load optional 
clustering
+        classes rather than statically referencing them. This matches the 
pattern
+        used in <code>Catalina.addClusterRuleSet()</code> and prevents
+        <code>NoClassDefFoundError</code> when 
<code>StoreConfigLifecycleListener</code>
+        is configured but clustering classes are not available. (csutherl)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
@@ -2935,6 +2942,24 @@
       <fix>
         Switch AJP secret comparison to a constant time algorithm. (markt)
       </fix>
+      <fix>
+        Align OpenSSL FFM behaviour with Tomcat Native for various OCSP edge
+        cases. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>69995</bug>: Make dependent ordering predictable. Patch submitted
+        by Jan Luehe. (remm)
+      </fix>
+      <fix>
+        <bug>70001</bug>: Ensure JSP compilation is reproducible when
+        dependencies exist for tag files and tag libraries located on the class
+        path but outside of the web application. <pr>992</pr> submitted by Jan
+        Luehe. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">
@@ -3002,24 +3027,10 @@
         non-trailer fields. Control characters (excluding TAB), and characters
         with code points above 255 will be replaced with a space. (markt)
       </add>
-      <fix>
-        Align OpenSSL FFM behaviour with Tomcat Native for various OCSP edge
-        cases. (markt)
-      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
     <changelog>
-      <fix>
-        <bug>69995</bug>: Make dependent ordering predictable. Patch submitted
-        by Jan Luehe. (remm)
-      </fix>
-      <fix>
-        <bug>70001</bug>: Ensure JSP compilation is reproducible when
-        dependencies exist for tag files and tag libraries located on the class
-        path but outside of the web application. <pr>992</pr> submitted by Jan
-        Luehe. (markt)
-      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">
@@ -3104,13 +3115,6 @@
         when closing am HTTP/2 connection. Pull request <pr>917</pr> provided 
by
         Kai Burjack. (markt)
       </add>
-      <fix>
-        Update <code>StoreRegistry</code> to dynamically load optional 
clustering
-        classes rather than statically referencing them. This matches the 
pattern
-        used in <code>Catalina.addClusterRuleSet()</code> and prevents
-        <code>NoClassDefFoundError</code> when 
<code>StoreConfigLifecycleListener</code>
-        is configured but clustering classes are not available. (csutherl)
-      </fix>
       <update>
         Update the minimum recommended version of Tomcat Native so that users 
of
         1.3.x are recommended to update to 2.0.x. (markt)
@@ -3180,6 +3184,10 @@
         Report handshake issues as <code>SSLException</code> in the FFM
         code, rather than <code>IllegalStateException</code>. (remm)
       </fix>
+      <fix>
+        <bug>69938</bug>: Avoid changing the closed state of TLS channel when
+        resetting it after close. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
@@ -3267,10 +3275,6 @@
         shutdown that triggered a significant memory leak. Patch provided by
         Wes. (markt)
       </fix>
-      <fix>
-        <bug>69938</bug>: Avoid changing the closed state of TLS channel when
-        resetting it after close. (remm)
-      </fix>
     </changelog>
   </subsection>
 </section>
@@ -3468,6 +3472,12 @@
       <update>
         Update bnd to 7.2.0. (markt)
       </update>
+      <add>
+        Add test profile system for selective test execution. Profiles can be
+        specified via <code>-Dtest.profile=&lt;name&gt;</code> to run specific
+        test subsets without using patterns directly. Profile patterns are
+        defined in <code>test-profiles.properties</code>. (csutherl)
+      </add>
     </changelog>
   </subsection>
 </section>
@@ -3569,12 +3579,6 @@
   </subsection>
   <subsection name="Other">
     <changelog>
-      <add>
-        Add test profile system for selective test execution. Profiles can be
-        specified via <code>-Dtest.profile=&lt;name&gt;</code> to run specific
-        test subsets without using patterns directly. Profile patterns are
-        defined in <code>test-profiles.properties</code>. (csutherl)
-      </add>
       <update>
         Update file extension to media type mappings to align with the current
         list used by the Apache Web Server (httpd). (markt)
@@ -3643,6 +3647,9 @@
         Fix AJP message length check. Pull request <pr>916</pr> by Joshua
         Rogers. (remm)
       </fix>
+      <fix>
+        Various OCSP processing issues in the OpenSSL FFM code. (dsoumis)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">
@@ -3736,9 +3743,6 @@
         requests received via the AJP connector were processed as OPTIONS
         requests and PROPFIND requests were processed as TRACE. (markt)
       </fix>
-      <fix>
-        Various OCSP processing issues in the OpenSSL FFM code. (dsoumis)
-      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to