This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 7b9ac80dad Update the internal fork of Apache Commons BCEL to 6.13.0
7b9ac80dad is described below
commit 7b9ac80dadc486da7ee7dcb0c843f121f67b62f7
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Sep 25 17:47:53 2026 +0100
Update the internal fork of Apache Commons BCEL to 6.13.0
---
java/org/apache/tomcat/util/bcel/Const.java | 38 +++++++++++++++++++++-
.../bcel/classfile/AnnotationElementValue.java | 2 +-
.../util/bcel/classfile/AnnotationEntry.java | 2 +-
.../util/bcel/classfile/ClassFormatException.java | 2 +-
.../tomcat/util/bcel/classfile/ClassParser.java | 4 +--
.../tomcat/util/bcel/classfile/ElementValue.java | 16 ++-------
webapps/docs/changelog.xml | 3 ++
7 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index b8169e256f..05c441de71 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -319,12 +319,48 @@ public final class Const {
*/
public static final short MAJOR_26 = 70;
+ /**
+ * Minor version number of class files for Java 27: {@value}.
+ *
+ * @see #MAJOR_27
+ *
+ * @since 6.13.0
+ */
+ public static final short MINOR_27 = 0;
+
+ /**
+ * Major version number of class files for Java 27: {@value}.
+ *
+ * @see #MINOR_27
+ *
+ * @since 6.13.0
+ */
+ public static final short MAJOR_27 = 71;
+
+ /**
+ * Minor version number of class files for Java 28: {@value}.
+ *
+ * @see #MAJOR_28
+ *
+ * @since 6.13.0
+ */
+ public static final short MINOR_28 = 0;
+
+ /**
+ * Major version number of class files for Java 28: {@value}.
+ *
+ * @see #MINOR_28
+ *
+ * @since 6.13.0
+ */
+ public static final short MAJOR_28 = 72;
+
/**
* Get the CONSTANT_NAMES entry at the given index.
*
* @param index index into {@code CONSTANT_NAMES}.
*
- * @return the CONSTANT_NAMES entry at the given index
+ * @return the CONSTANT_NAMES entry at the given index.
*/
public static String getConstantName(final int index) {
return CONSTANT_NAMES[index];
diff --git
a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
index ebaef47f83..a1f85c9a36 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
@@ -34,7 +34,7 @@ public class AnnotationElementValue extends ElementValue {
/**
* Gets the annotation entry.
*
- * @return the annotation entry.
+ * @return The annotation entry.
*/
public AnnotationEntry getAnnotationEntry() {
return annotationEntry;
diff --git a/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
b/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
index adf07110b6..a8368948e3 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
@@ -57,7 +57,7 @@ public class AnnotationEntry {
/**
* Gets the annotation type name.
*
- * @return the annotation type name.
+ * @return The annotation type name.
*/
public String getAnnotationType() {
return constantPool.getConstantUtf8(typeIndex).getBytes();
diff --git
a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
index 006090f50d..d0328da501 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
@@ -34,7 +34,7 @@ public class ClassFormatException extends RuntimeException {
* Constructs a new instance with the specified detail message. The cause
is not initialized, and may subsequently be initialized by a call to
* {@link #initCause}.
*
- * @param message the detail message. The detail message is saved for
later retrieval by the {@link #getMessage()} method.
+ * @param message The detail message. The detail message is saved for
later retrieval by the {@link #getMessage()} method.
*/
public ClassFormatException(final String message) {
super(message);
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index ba4cd9ff8f..06437cb59d 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -140,8 +140,8 @@ public final class ClassParser {
/**
* Reads information about the class and its super class.
*
- * @throws IOException if an I/O error occurs.
- * @throws ClassFormatException if a class is malformed or cannot be
interpreted as a class file.
+ * @throws IOException Thrown if an I/O error occurs.
+ * @throws ClassFormatException Thrown if a class is malformed or cannot
be interpreted as a class file.
*/
private void readClassInfo() throws IOException, ClassFormatException {
accessFlags = dataInputStream.readUnsignedShort();
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
index d0f077b80f..a704a24112 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
@@ -109,24 +109,14 @@ public abstract class ElementValue {
*
* @param input Raw data input.
* @param cpool Constant pool.
- * @return a new ElementValue.
- * @throws IOException if an I/O error occurs.
+ * @return A new ElementValue.
+ * @throws IOException Thrown if an I/O error occurs.
*/
public static ElementValue readElementValue(final DataInput input, final
ConstantPool cpool) throws IOException {
return readElementValue(input, cpool, 0);
}
- /**
- * Reads an {@code element_value} as an {@code ElementValue}.
- *
- * @param input Raw data input.
- * @param cpool Constant pool.
- * @param arrayNesting level of current array nesting.
- * @return a new ElementValue.
- * @throws IOException if an I/O error occurs.
- * @since 6.7.0
- */
- public static ElementValue readElementValue(final DataInput input, final
ConstantPool cpool, int arrayNesting)
+ static ElementValue readElementValue(final DataInput input, final
ConstantPool cpool, int arrayNesting)
throws IOException {
final byte tag = input.readByte();
switch (tag) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 68f3dc9036..3155b936a5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -441,6 +441,9 @@
Update Checkstyle to 14.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.13.0. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
