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

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

commit 42241532de2339d2f4f50c5a40cf96135060c8e9
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Nov 10 18:04:30 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 | 102 +++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 49 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c76a733711..30d6b8bd92 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -2703,6 +2703,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">
@@ -2914,6 +2921,20 @@
       </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">
     <changelog>
       <fix>
@@ -2989,20 +3010,6 @@
       </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">
     <changelog>
       <fix>
@@ -3076,13 +3083,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)
@@ -3155,6 +3155,10 @@
       <fix>
         Fix case sensitive handling of the protocol host name. (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">
@@ -3239,10 +3243,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>
@@ -3609,6 +3609,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">
@@ -3689,9 +3692,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">
@@ -6138,6 +6138,15 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        Prevent the web application's ClassLoader from being pinned by the JSP
+        compiler if an application uses a custom XMLInputFactory. Based upon a
+        suggestion from Simon Niederberger. (schultz)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <update>
@@ -6266,11 +6275,6 @@
         and the web application is deployed as a WAR file rather than an
         unpacked directory. (markt)
       </fix>
-      <fix>
-        Prevent the web application's ClassLoader from being pinned by the JSP
-        compiler if an application uses a custom XMLInputFactory. Based upon a
-        suggestion from Simon Niederberger. (schultz)
-      </fix>
     </changelog>
   </subsection>
   <subsection name="Cluster">
@@ -7018,6 +7022,10 @@
       <update>
         Update Tomcat Native to 2.0.5. (markt)
       </update>
+      <fix>
+        Align documentation for maxParameterCount to match hard-coded defaults.
+        Contributed by Michal Sobkiewicz. (schultz)
+      </fix>
     </changelog>
   </subsection>
 </section>
@@ -7134,10 +7142,6 @@
       <update>
         Update JSign to 5.0. (markt/rjung)
       </update>
-      <fix>
-        Align documentation for maxParameterCount to match hard-coded defaults.
-        Contributed by Michal Sobkiewicz. (schultz)
-      </fix>
     </changelog>
   </subsection>
 </section>
@@ -7325,6 +7329,10 @@
         Update the packaged version of the Tomcat Migration Tool for Jakarta EE
         to 1.0.7. (markt)
       </update>
+      <fix>
+        Enhance PEMFile to load from an InputStream. Patch provided by
+        Romain Manni-Bucau. (schultz)
+      </fix>
     </changelog>
   </subsection>
 </section>
@@ -7523,10 +7531,6 @@
       <update>
         Update Jacoco to 0.8.9. (markt)
       </update>
-      <fix>
-        Enhance PEMFile to load from an InputStream. Patch provided by
-        Romain Manni-Bucau. (schultz)
-      </fix>
     </changelog>
   </subsection>
 </section>
@@ -7843,6 +7847,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="jdbc-pool">
+    <changelog>
+      <fix>
+        <bug>66346</bug>: Ensure all JDBC pool JARs are reproducible. Pull
+        request <pr>566</pr> provided by John Neffenger. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <scode>
@@ -7954,14 +7966,6 @@
       </fix>
     </changelog>
   </subsection>
-  <subsection name="jdbc-pool">
-    <changelog>
-      <fix>
-        <bug>66346</bug>: Ensure all JDBC pool JARs are reproducible. Pull
-        request <pr>566</pr> provided by John Neffenger. (markt)
-      </fix>
-    </changelog>
-  </subsection>
   <subsection name="Other">
     <changelog>
       <update>


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

Reply via email to