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 733633a Add support for Java 11 as the source/target for JSP
compilation
733633a is described below
commit 733633aebd756614e48023062fff09ee1ed3e58d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 20 15:07:11 2019 +0000
Add support for Java 11 as the source/target for JSP compilation
---
java/org/apache/jasper/compiler/JDTCompiler.java | 9 +++++++++
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index ecfd0a8..5f1d07a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -379,6 +379,10 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Constant not available in latest ECJ version that runs on
// Java 7
settings.put(CompilerOptions.OPTION_Source, "10");
+ } else if(opt.equals("11")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7
+ settings.put(CompilerOptions.OPTION_Source, "11");
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -435,6 +439,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Java 7
settings.put(CompilerOptions.OPTION_TargetPlatform, "10");
settings.put(CompilerOptions.OPTION_Compliance, "10");
+ } else if(opt.equals("11")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "11");
+ settings.put(CompilerOptions.OPTION_Compliance, "11");
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e812a97..1750e84 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <add>
+ Add support for specifying Java 11 (with the value <code>11</code>) as
+ the compiler source and/or compiler target for JSP compilation. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
