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 5e286448c8 Add new classes introduced in Java 23 5e286448c8 is described below commit 5e286448c8dbd96b0dacc921dd9e0713a25a707b Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jun 18 12:05:11 2024 +0100 Add new classes introduced in Java 23 --- java/jakarta/el/ImportHandler.java | 1 + test/jakarta/el/TestImportHandlerStandardPackages.java | 2 +- webapps/docs/changelog.xml | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/java/jakarta/el/ImportHandler.java b/java/jakarta/el/ImportHandler.java index 8cb86f990e..54b72f839b 100644 --- a/java/jakarta/el/ImportHandler.java +++ b/java/jakarta/el/ImportHandler.java @@ -187,6 +187,7 @@ public class ImportHandler { javaLangClassNames.add("Runtime.Version"); javaLangClassNames.add("RuntimePermission"); javaLangClassNames.add("ScopedValue"); + javaLangClassNames.add("ScopedValue.CallableOp"); javaLangClassNames.add("ScopedValue.Carrier"); javaLangClassNames.add("SecurityManager"); javaLangClassNames.add("Short"); diff --git a/test/jakarta/el/TestImportHandlerStandardPackages.java b/test/jakarta/el/TestImportHandlerStandardPackages.java index b93b06e586..1d4485e53c 100644 --- a/test/jakarta/el/TestImportHandlerStandardPackages.java +++ b/test/jakarta/el/TestImportHandlerStandardPackages.java @@ -54,7 +54,7 @@ public class TestImportHandlerStandardPackages { // The intention is that this test will catch new classes when the // tests are run on a newer JRE. // The latest version of the JRE where this test is known to pass is - // - OpenJDK 19 EA 22 + // - OpenJDK 24 EA 2 ModuleFinder.ofSystem().find("java.base").get().open().list().filter(c -> (c.startsWith("java/lang/"))) .filter(c -> c.lastIndexOf('/') == 9) // Exclude sub-packages .filter(c -> c.endsWith(".class")) // Exclude non-class resources diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 50b7674cc2..4ab75b9846 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -115,6 +115,15 @@ </fix> </changelog> </subsection> + <subsection name="Jasper"> + <changelog> + <fix> + Update the optimisation in <code>jakarta.el.ImportHandler</code> so it + is aware of new classes added to the <code>java.lang</code> package in + Java 23. (markt) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 11.0.0-M21 (markt)" rtext="release in progress"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org