This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 544f8d176c Add new classes introduced in Java 23
544f8d176c is described below
commit 544f8d176cf17758b87c50663545efb2af01d980
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 18 12:05:11 2024 +0100
Add new classes introduced in Java 23
---
java/javax/el/ImportHandler.java | 1 +
test/javax/el/TestImportHandlerStandardPackages.java | 2 +-
webapps/docs/changelog.xml | 9 +++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index b51c1bb07d..ee8fa97899 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/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/javax/el/TestImportHandlerStandardPackages.java
b/test/javax/el/TestImportHandlerStandardPackages.java
index 0fad5b69ff..ca5106215d 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -60,7 +60,7 @@ public class TestImportHandlerStandardPackages {
// every test run. The intention is that it 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
if (!JreCompat.isJre9Available()) {
return;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index adf1d27ef2..274924aa06 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 9.0.90 (remm)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
