This is an automated email from the ASF dual-hosted git repository.
markt 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 82fbec5e99 Update the internal fork of Apache Commons BCEL to 6.11.0.
82fbec5e99 is described below
commit 82fbec5e990b868742d830429351bfa0cc0b6fb7
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Oct 13 18:12:17 2025 +0100
Update the internal fork of Apache Commons BCEL to 6.11.0.
---
java/org/apache/tomcat/util/bcel/Const.java | 16 ++++++++++++++++
java/org/apache/tomcat/util/bcel/classfile/Utility.java | 5 +----
webapps/docs/changelog.xml | 3 +++
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index da8b49a7c7..cd737de9b6 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -268,6 +268,22 @@ public final class Const {
*/
public static final short MAJOR_24 = 68;
+ /**
+ * Minor version number of class files for Java 25: {@value}.
+ *
+ * @see #MAJOR_25
+ * @since 6.11.0
+ */
+ public static final short MINOR_25 = 0;
+
+ /**
+ * Major version number of class files for Java 25: {@value}.
+ *
+ * @see #MINOR_25
+ * @since 6.11.0
+ */
+ public static final short MAJOR_25 = 69;
+
/**
* Get the CONSTANT_NAMES entry at the given index.
*
diff --git a/java/org/apache/tomcat/util/bcel/classfile/Utility.java
b/java/org/apache/tomcat/util/bcel/classfile/Utility.java
index 162fac8b66..830f8d149c 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/Utility.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/Utility.java
@@ -28,10 +28,7 @@ import org.apache.tomcat.util.bcel.Const;
final class Utility {
/**
- * Shorten long class name <em>str</em>, i.e., chop off the
<em>prefix</em>,
- * if the
- * class name starts with this string and the flag <em>chopit</em> is true.
- * Slashes <em>/</em> are converted to dots <em>.</em>.
+ * Shorten long class names, <em>java/lang/String</em> becomes
<em>String</em>.
*
* @param str The long class name
* @return Compacted class name
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b33a536177..5ebd3398a7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -287,6 +287,9 @@
Update Derby to 10.17.1.0. (markt)
</update>
<!-- Entries for backport and removal before 12.0.0-M1 below this line
-->
+ <update>
+ Update the internal fork of Apache Commons BCEL to 6.11.0. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
