This is an automated email from the ASF dual-hosted git repository.
markt 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 fe939bf1f1 Update internal fork of BCEL to 6.10.0
fe939bf1f1 is described below
commit fe939bf1f198340c8bb2b1adc8aed3d4ee21c0e4
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 29 14:00:44 2024 +0100
Update internal fork of BCEL to 6.10.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/Const.java | 48 ++++++++++++++++++++++
.../util/bcel/classfile/ArrayElementValue.java | 2 +-
webapps/docs/changelog.xml | 3 ++
4 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 679450e6ad..352231a2ae 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.9.0 (2024-04-27)
+rel/commons-bcel-6.10.0 (2024-07-23)
FileUpload
----------
diff --git a/java/org/apache/tomcat/util/bcel/Const.java
b/java/org/apache/tomcat/util/bcel/Const.java
index 894a63cc51..da8b49a7c7 100644
--- a/java/org/apache/tomcat/util/bcel/Const.java
+++ b/java/org/apache/tomcat/util/bcel/Const.java
@@ -220,6 +220,54 @@ public final class Const {
*/
public static final int MAX_ARRAY_DIMENSIONS = 255;
+ /**
+ * Minor version number of class files for Java 22: {@value}.
+ *
+ * @see #MAJOR_22
+ * @since 6.10.0
+ */
+ public static final short MINOR_22 = 0;
+
+ /**
+ * Minor version number of class files for Java 23: {@value}.
+ *
+ * @see #MAJOR_23
+ * @since 6.10.0
+ */
+ public static final short MINOR_23 = 0;
+
+ /**
+ * Minor version number of class files for Java 24: {@value}.
+ *
+ * @see #MAJOR_24
+ * @since 6.10.0
+ */
+ public static final short MINOR_24 = 0;
+
+ /**
+ * Major version number of class files for Java 22: {@value}.
+ *
+ * @see #MINOR_22
+ * @since 6.10.0
+ */
+ public static final short MAJOR_22 = 66;
+
+ /**
+ * Major version number of class files for Java 23: {@value}.
+ *
+ * @see #MINOR_23
+ * @since 6.10.0
+ */
+ public static final short MAJOR_23 = 67;
+
+ /**
+ * Major version number of class files for Java 24: {@value}.
+ *
+ * @see #MINOR_24
+ * @since 6.10.0
+ */
+ public static final short MAJOR_24 = 68;
+
/**
* Get the CONSTANT_NAMES entry at the given index.
*
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index 69a85b2c72..45ac2298b1 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -26,7 +26,7 @@ public class ArrayElementValue extends ElementValue
if (type != ARRAY) {
throw new ClassFormatException("Only element values of type array
can be built with this ctor - type specified: " + type);
}
- this.elementValues = elementValues != null ? elementValues :
ElementValue.EMPTY_ARRAY;
+ this.elementValues = elementValues != null ? elementValues :
EMPTY_ARRAY;
}
public ElementValue[] getElementValuesArray() {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8f6d16e70a..f3ae289a58 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -204,6 +204,9 @@
<update>
Update CheckStyle to 10.18.0. (markt)
</update>
+ <update>
+ Update the internal fork of Apache Commons BCEL to 6.10.0. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
