This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new bfea53d Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
bfea53d is described below
commit bfea53dae62342f5aa984b15d916221def179836
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 | 30 ++++++++++++++++++++----
webapps/docs/changelog.xml | 11 +++++++++
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 91de3dc..bec0887 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -386,8 +386,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 6.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "12");
} else if(opt.equals("13")) {
@@ -395,6 +395,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,
@@ -459,8 +469,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "11");
settings.put(CompilerOptions.OPTION_Compliance, "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 6.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "12");
settings.put(CompilerOptions.OPTION_Compliance, "12");
@@ -470,6 +480,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 50921ca..91c0acc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -82,6 +82,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
