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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new fb5b3ffe0a Next is 10.1.24
fb5b3ffe0a is described below

commit fb5b3ffe0a038e9e59fc381e5e344f0292af794b
Author: remm <r...@apache.org>
AuthorDate: Tue Apr 23 17:15:08 2024 +0200

    Next is 10.1.24
    
    Fix changelog.
---
 build.properties.default         |  2 +-
 res/maven/mvn.properties.default |  2 +-
 webapps/docs/changelog.xml       | 60 +++++++++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 0efb35249b..9a6764c453 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # ----- Version Control Flags -----
 version.major=10
 version.minor=1
-version.build=23
+version.build=24
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 0e3eb7861b..d5a2848510 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.23
+maven.asf.release.deploy.version=10.1.24
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b27c12dbe9..20ee6a0cbc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,27 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-<section name="Tomcat 10.1.23 (schultz)" rtext="in development">
+<section name="Tomcat 10.1.24 (schultz)" rtext="in development">
   <subsection name="Catalina">
     <changelog>
-      <update>
-        Deprecate and remove <code>sessionCounter</code> (replaced by the
-        addition of the active session count and the expired session count,
-        as a reasonable approximation) and <code>duplicates</code> (which
-        does not represent a possible event in current implementations)
-        statistics from the session manager. (remm)
-      </update>
-      <fix>
-        <bug>68890</bug> Align output encoding of JSPs in the Manager webapp
-        with the XML declarations in those same files. (schultz)
-      </fix>
-      <fix>
-        Update Basic authentication to implement the requirements of RFC 7617
-        including the changing of the <code>trimCredentials</code> setting 
which
-        is now defaults to <code>false</code>. Note that the
-        <code>trimCredentials</code> setting will be removed in Tomcat 11.
-        (markt)
-      </fix>
       <add>
         Small performance optimization when logging cookies with no values.
         (schultz)
@@ -143,12 +125,6 @@
   </subsection>
   <subsection name="Coyote">
     <changelog>
-      <fix>
-        Fix bnd jar descriptor to include the OpenSSL FFM support. (remm)
-      </fix>
-      <fix>
-        Add OpenSSL FFM classes to <code>tomcat-embed-core.jar</code>. (remm)
-      </fix>
       <fix>
         Align non-secure and secure writes with NIO and skip the write attempt
         when there are no bytes to be written. (markt)
@@ -186,6 +162,40 @@
     </changelog>
   </subsection>
 </section>
+<section name="Tomcat 10.1.23 (schultz)" rtext="release in progress">
+  <subsection name="Catalina">
+    <changelog>
+      <update>
+        Deprecate and remove <code>sessionCounter</code> (replaced by the
+        addition of the active session count and the expired session count,
+        as a reasonable approximation) and <code>duplicates</code> (which
+        does not represent a possible event in current implementations)
+        statistics from the session manager. (remm)
+      </update>
+      <fix>
+        <bug>68890</bug> Align output encoding of JSPs in the Manager webapp
+        with the XML declarations in those same files. (schultz)
+      </fix>
+      <fix>
+        Update Basic authentication to implement the requirements of RFC 7617
+        including the changing of the <code>trimCredentials</code> setting 
which
+        is now defaults to <code>false</code>. Note that the
+        <code>trimCredentials</code> setting will be removed in Tomcat 11.
+        (markt)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        Fix bnd jar descriptor to include the OpenSSL FFM support. (remm)
+      </fix>
+      <fix>
+        Add OpenSSL FFM classes to <code>tomcat-embed-core.jar</code>. (remm)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 10.1.22 (schultz)" rtext="not released">
   <subsection name="Other">
     <changelog>


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

Reply via email to