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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 388fefa Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
388fefa is described below
commit 388fefa9e24e7de7c4b30b98df83f4283b4cb85d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Mar 28 15:01:34 2020 +0000
Add Java 14 and 15 support to JSP compilation when supported by the ECJ
Also update comments about latest Java version supported by newer ECJ
releases.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 26 ++++++++++++++++++++++--
webapps/docs/changelog.xml | 11 ++++++++++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 1d0f0b7..ec347d8 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -355,8 +355,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "11");
} else if(opt.equals("12")) {
- // Constant not available in latest available ECJ version.
- // May be supported in a snapshot build.
+ // 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, "12");
} else if(opt.equals("13")) {
@@ -364,6 +364,16 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
+ } else if(opt.equals("14")) {
+ // Constant not available in latest available ECJ version.
+ // May be supported in a snapshot build.
+ // This is checked against the actual version below.
+ settings.put(CompilerOptions.OPTION_Source, "14");
+ } else if(opt.equals("15")) {
+ // Constant not available in latest available ECJ version.
+ // May be supported in a snapshot build.
+ // This is checked against the actual version below.
+ settings.put(CompilerOptions.OPTION_Source, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
@@ -439,6 +449,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
settings.put(CompilerOptions.OPTION_Compliance, "13");
+ } else if(opt.equals("14")) {
+ // 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, "14");
+ settings.put(CompilerOptions.OPTION_Compliance, "14");
+ } else if(opt.equals("15")) {
+ // 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, "15");
+ settings.put(CompilerOptions.OPTION_Compliance, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 567be56..a0d7263 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,6 +86,17 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <add>
+ Add support for specifying Java 14 (with the value <code>14</code>) and
+ Java 15 (with the value <code>15</code>) as the compiler source and/or
+ compiler target for JSP compilation. If used with an ECJ version that
+ does not support these values, a warning will be logged and the latest
+ supported version 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
