This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 87e34bed3d21377bedf830d9d03f2ae44e0dcc2f Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Feb 27 09:01:47 2024 +0000 Add support for JSP compilation with Java 22 --- java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++++++++++ webapps/docs/changelog.xml | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java index 8ab753b541..487499b7ba 100644 --- a/java/org/apache/jasper/compiler/JDTCompiler.java +++ b/java/org/apache/jasper/compiler/JDTCompiler.java @@ -384,6 +384,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { // Java 7. // This is checked against the actual version below. settings.put(CompilerOptions.OPTION_Source, "21"); + } else if (opt.equals("22")) { + // Constant not available in latest ECJ version that runs on + // Java 7. + // This is checked against the actual version below. + settings.put(CompilerOptions.OPTION_Source, "22"); } else { log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt)); settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); @@ -493,6 +498,12 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { // This is checked against the actual version below. settings.put(CompilerOptions.OPTION_TargetPlatform, "21"); settings.put(CompilerOptions.OPTION_Compliance, "21"); + } else if (opt.equals("22")) { + // Constant not available in latest ECJ version that runs on + // Java 7. + // This is checked against the actual version below. + settings.put(CompilerOptions.OPTION_TargetPlatform, "22"); + settings.put(CompilerOptions.OPTION_Compliance, "22"); } else { log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt)); settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7); diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index cfa29db518..37737186fb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 8.5.100 (schultz)" rtext="in development"> + <subsection name="Jasper"> + <changelog> + <add> + Add support for specifying Java 22 (with the value <code>22</code>) as + the compiler source and/or compiler target for JSP compilation. If used + with an Eclipse JDT compiler version that does not support these values, + a warning will be logged and the default will used. + (markt) + </add> + </changelog> + </subsection> <subsection name="Other"> <changelog> <add> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org