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 9444423a6b Add support for compiling JSPs using Java 20
9444423a6b is described below
commit 9444423a6b8d9986a8060cd10e3a59303dab17ae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 30 11:16:05 2022 +0100
Add support for compiling JSPs using Java 20
---
java/org/apache/jasper/compiler/JDTCompiler.java | 25 ++++++++++++++----------
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 94876897bd..1b71dc5169 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -313,16 +313,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
- } else if (opt.equals("18")) {
+ } else if(opt.equals("18")) {
+ settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_18);
+ } else if (opt.equals("19")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
- settings.put(CompilerOptions.OPTION_Source, "18");
- } else if (opt.equals("19")) {
+ settings.put(CompilerOptions.OPTION_Source, "19");
+ } else if (opt.equals("20")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
- settings.put(CompilerOptions.OPTION_Source, "19");
+ settings.put(CompilerOptions.OPTION_Source, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
@@ -384,18 +386,21 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if(opt.equals("17")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
- } else if (opt.equals("18")) {
- // Constant not available in latest ECJ version shipped with
- // Tomcat. May be supported in a snapshot build.
- // This is checked against the actual version below.
- settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
- settings.put(CompilerOptions.OPTION_Compliance, "18");
+ } else if(opt.equals("18")) {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_18);
+ settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_18);
} else if (opt.equals("19")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
settings.put(CompilerOptions.OPTION_Compliance, "19");
+ } else if (opt.equals("20")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
+ // This is checked against the actual version below.
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
+ settings.put(CompilerOptions.OPTION_Compliance, "20");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 38be2e332a..22557e5bfd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,6 +119,13 @@
<bug>66277</bug>: Fix regressions in refactoring from
<code>Stack</code>
<code>ArrayDeque</code>.
</fix>
+ <add>
+ Add support for specifying Java 20 (with the value <code>20</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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
