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 2117788845 Update internal fork of BCEL to 6.8.2 2117788845 is described below commit 2117788845e2085a990653b7bbf4ce5c4decc3b5 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Apr 2 17:32:24 2024 +0100 Update internal fork of BCEL to 6.8.2 --- MERGE.txt | 2 +- java/org/apache/tomcat/util/bcel/Const.java | 48 +++++++++++----------- .../util/bcel/classfile/ClassFormatException.java | 10 ++--- .../tomcat/util/bcel/classfile/ClassParser.java | 4 +- .../tomcat/util/bcel/classfile/JavaClass.java | 4 +- .../tomcat/util/bcel/classfile/package-info.java | 21 ++++++++++ .../apache/tomcat/util/bcel/classfile/package.html | 27 ------------ java/org/apache/tomcat/util/bcel/package-info.java | 22 ++++++++++ java/org/apache/tomcat/util/bcel/package.html | 30 -------------- webapps/docs/changelog.xml | 3 ++ 10 files changed, 79 insertions(+), 92 deletions(-) diff --git a/MERGE.txt b/MERGE.txt index af5ebba3fd..9ad4d0c5a5 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: -2ee2bff580c7138545377628074173412c27290c (2023-01-03) +rel/commons-bcel-6.8.2 (2024-02-25) Codec ----- diff --git a/java/org/apache/tomcat/util/bcel/Const.java b/java/org/apache/tomcat/util/bcel/Const.java index 301ace69dc..894a63cc51 100644 --- a/java/org/apache/tomcat/util/bcel/Const.java +++ b/java/org/apache/tomcat/util/bcel/Const.java @@ -22,7 +22,7 @@ package org.apache.tomcat.util.bcel; public final class Const { /** - * Java class file format Magic number (0xCAFEBABE) + * Java class file format Magic number: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.1-200-A"> The ClassFile Structure * in The Java Virtual Machine Specification</a> @@ -30,7 +30,7 @@ public final class Const { public static final int JVM_CLASSFILE_MAGIC = 0xCAFEBABE; /** - * One of the access flags for fields, methods, or classes. + * One of the access flags for fields, methods, or classes: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.1-200-E.1"> Flag definitions for * Classes in the Java Virtual Machine Specification (Java SE 9 Edition).</a> @@ -44,28 +44,28 @@ public final class Const { public static final short ACC_FINAL = 0x0010; /** - * One of the access flags for fields, methods, or classes. + * One of the access flags for classes: {@value}. * * @see #ACC_FINAL */ public static final short ACC_INTERFACE = 0x0200; /** - * One of the access flags for fields, methods, or classes. + * One of the access flags for methods or classes: {@value}. * * @see #ACC_FINAL */ public static final short ACC_ABSTRACT = 0x0400; /** - * One of the access flags for fields, methods, or classes. + * One of the access flags for classes: {@value}. * * @see #ACC_FINAL */ public static final short ACC_ANNOTATION = 0x2000; /** - * Marks a constant pool entry as type UTF-8. + * Marks a constant pool entry as type UTF-8: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.7"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -78,7 +78,7 @@ public final class Const { */ /** - * Marks a constant pool entry as type Integer. + * Marks a constant pool entry as type Integer: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -86,7 +86,7 @@ public final class Const { public static final byte CONSTANT_Integer = 3; /** - * Marks a constant pool entry as type Float. + * Marks a constant pool entry as type Float: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.4"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -94,7 +94,7 @@ public final class Const { public static final byte CONSTANT_Float = 4; /** - * Marks a constant pool entry as type Long. + * Marks a constant pool entry as type Long: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -102,7 +102,7 @@ public final class Const { public static final byte CONSTANT_Long = 5; /** - * Marks a constant pool entry as type Double. + * Marks a constant pool entry as type Double: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.5"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -110,7 +110,7 @@ public final class Const { public static final byte CONSTANT_Double = 6; /** - * Marks a constant pool entry as a Class + * Marks a constant pool entry as a Class: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.1"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -118,7 +118,7 @@ public final class Const { public static final byte CONSTANT_Class = 7; /** - * Marks a constant pool entry as a Field Reference. + * Marks a constant pool entry as a Field Reference: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -126,7 +126,7 @@ public final class Const { public static final byte CONSTANT_Fieldref = 9; /** - * Marks a constant pool entry as type String + * Marks a constant pool entry as type String: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.3"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -134,7 +134,7 @@ public final class Const { public static final byte CONSTANT_String = 8; /** - * Marks a constant pool entry as a Method Reference. + * Marks a constant pool entry as a Method Reference: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -142,7 +142,7 @@ public final class Const { public static final byte CONSTANT_Methodref = 10; /** - * Marks a constant pool entry as an Interface Method Reference. + * Marks a constant pool entry as an Interface Method Reference: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.2"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -150,7 +150,7 @@ public final class Const { public static final byte CONSTANT_InterfaceMethodref = 11; /** - * Marks a constant pool entry as a name and type. + * Marks a constant pool entry as a name and type: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.6"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -158,7 +158,7 @@ public final class Const { public static final byte CONSTANT_NameAndType = 12; /** - * Marks a constant pool entry as a Method Handle. + * Marks a constant pool entry as a Method Handle: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.8"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -166,7 +166,7 @@ public final class Const { public static final byte CONSTANT_MethodHandle = 15; /** - * Marks a constant pool entry as a Method Type. + * Marks a constant pool entry as a Method Type: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.9"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -174,7 +174,7 @@ public final class Const { public static final byte CONSTANT_MethodType = 16; /** - * Marks a constant pool entry as dynamically computed. + * Marks a constant pool entry as dynamically computed: {@value}. * * @see <a href="https://bugs.openjdk.java.net/secure/attachment/74618/constant-dynamic.html"> Change request for JEP * 309</a> @@ -182,7 +182,7 @@ public final class Const { public static final byte CONSTANT_Dynamic = 17; /** - * Marks a constant pool entry as an Invoke Dynamic + * Marks a constant pool entry as an Invoke Dynamic: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -190,7 +190,7 @@ public final class Const { public static final byte CONSTANT_InvokeDynamic = 18; /** - * Marks a constant pool entry as a Module Reference. + * Marks a constant pool entry as a Module Reference: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.11"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -198,7 +198,7 @@ public final class Const { public static final byte CONSTANT_Module = 19; /** - * Marks a constant pool entry as a Package Reference. + * Marks a constant pool entry as a Package Reference: {@value}. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se9/html/jvms-4.html#jvms-4.4.12"> The Constant Pool in The * Java Virtual Machine Specification</a> @@ -213,7 +213,7 @@ public final class Const { "CONSTANT_MethodHandle", "CONSTANT_MethodType", "CONSTANT_Dynamic", "CONSTANT_InvokeDynamic", "CONSTANT_Module", "CONSTANT_Package"}; /** - * The maximum number of dimensions in an array ({@value}). One of the limitations of the Java Virtual Machine. + * The maximum number of dimensions in an array: {@value}. One of the limitations of the Java Virtual Machine. * * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.3.2-150"> Field Descriptors in * The Java Virtual Machine Specification</a> @@ -223,7 +223,7 @@ public final class Const { /** * Get the CONSTANT_NAMES entry at the given index. * - * @param index The index for which the constant name is required + * @param index index into {@code CONSTANT_NAMES}. * @return the CONSTANT_NAMES entry at the given index */ public static String getConstantName(final int index) { diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java index 1701ae6345..006090f50d 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java @@ -42,12 +42,10 @@ public class ClassFormatException extends RuntimeException { /** * Constructs a new instance with the specified detail message and cause. - * <p> - * Note that the detail message associated with {@code cause} is <i>not</i> automatically incorporated in this runtime exception's detail message. * * @param message the detail message (which is saved for later retrieval by the {@link #getMessage()} method). - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). (A {@code null} value is permitted, and indicates that - * the cause is nonexistent or unknown.) + * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). A {@code null} value is permitted, and indicates that + * the cause is nonexistent or unknown. */ public ClassFormatException(final String message, final Throwable cause) { super(message, cause); @@ -57,8 +55,8 @@ public class ClassFormatException extends RuntimeException { * Constructs a new instance with the specified cause and a detail message of {@code (cause==null ? null : cause.toString())} (which typically contains the * class and detail message of {@code cause}). This constructor is useful for runtime exceptions that are little more than wrappers for other throwables. * - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). (A {@code null} value is permitted, and indicates that the - * cause is nonexistent or unknown.) + * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). A {@code null} value is permitted, and indicates that the + * cause is nonexistent or unknown. */ public ClassFormatException(final Throwable cause) { super(cause); diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java index 6fd322a907..7332c1f604 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java @@ -32,7 +32,7 @@ import org.apache.tomcat.util.bcel.Const; * appropriate exception is propagated back to the caller. * * The structure and the names comply, except for a few conveniences, exactly with the - * <a href="http://docs.oracle.com/javase/specs/"> JVM specification 1.0</a>. See this paper for further details about + * <a href="https://docs.oracle.com/javase/specs/"> JVM specification 1.0</a>. See this paper for further details about * the structure of a bytecode file. */ public final class ClassParser { @@ -62,7 +62,7 @@ public final class ClassParser { /** * Parses the given Java class file and return an object that represents the contained data, i.e., constants, methods, * fields and commands. A <em>ClassFormatException</em> is raised, if the file is not a valid .class file. (This does - * not include verification of the byte code as it is performed by the java interpreter). + * not include verification of the byte code as it is performed by the Java interpreter). * * @return Class object representing the parsed class file * @throws IOException if an I/O error occurs. diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java index a620342655..65976775dd 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java +++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java @@ -120,8 +120,8 @@ public class JavaClass { /** - * returns the super class name of this class. In the case that this class is java.lang.Object, it will return itself - * (java.lang.Object). This is probably incorrect but isn't fixed at this time to not break existing clients. + * returns the super class name of this class. In the case that this class is {@link Object}, it will return itself + * ({@link Object}). This is probably incorrect but isn't fixed at this time to not break existing clients. * * @return Superclass name. */ diff --git a/java/org/apache/tomcat/util/bcel/classfile/package-info.java b/java/org/apache/tomcat/util/bcel/classfile/package-info.java new file mode 100644 index 0000000000..0cdf173152 --- /dev/null +++ b/java/org/apache/tomcat/util/bcel/classfile/package-info.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Classes that describe the structure of a Java class file and a class file parser. + */ +package org.apache.tomcat.util.bcel.classfile; \ No newline at end of file diff --git a/java/org/apache/tomcat/util/bcel/classfile/package.html b/java/org/apache/tomcat/util/bcel/classfile/package.html deleted file mode 100644 index 4a9c4b306c..0000000000 --- a/java/org/apache/tomcat/util/bcel/classfile/package.html +++ /dev/null @@ -1,27 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -</head> -<body bgcolor="white"> -<p> -This package contains the classes that describe the structure of a -Java class file and a class file parser. -</p> -</body> -</html> diff --git a/java/org/apache/tomcat/util/bcel/package-info.java b/java/org/apache/tomcat/util/bcel/package-info.java new file mode 100644 index 0000000000..91b01921eb --- /dev/null +++ b/java/org/apache/tomcat/util/bcel/package-info.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Basic classes for the <a href="https://commons.apache.org/bcel/">Apache Byte Code Engineering Library (BCEL)</a> and constants defined by the + * <a href="https://docs.oracle.com/javase/specs/"> JVM specification</a>. + */ +package org.apache.tomcat.util.bcel; \ No newline at end of file diff --git a/java/org/apache/tomcat/util/bcel/package.html b/java/org/apache/tomcat/util/bcel/package.html deleted file mode 100644 index 3deb1a369e..0000000000 --- a/java/org/apache/tomcat/util/bcel/package.html +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -</head> -<body bgcolor="white"> -<p> -This package contains basic classes for the -<a href="https://commons.apache.org/bcel/">Byte Code Engineering Library</a> - and constants defined by the -<a href="https://docs.oracle.com/javase/specs/"> - JVM specification</a>. -</p> -</body> -</html> diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index b2be982712..e1a54c0cb6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -201,6 +201,9 @@ <update> Update Checkstyle to 10.14.1. (markt) </update> + <update> + Update the internal fork of Apache Commons BCEL to 6.8.2. (markt) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org