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 a8b43c4 Add support for Java 11 as the source/target for JSP
compilation
a8b43c4 is described below
commit a8b43c40dabd98c0c3f375a307ea09c9007cedb7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 20 15:05:05 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 9947152..6e20eed 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -348,6 +348,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,
@@ -404,6 +408,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 71dcec4..bc2a16f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,6 +87,14 @@
</fix>
</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
