Author: markt
Date: Sun Apr 22 19:02:29 2018
New Revision: 1829796
URL: http://svn.apache.org/viewvc?rev=1829796&view=rev
Log:
Enable Java 10 to be specified as a JSP source and/or target if a newer ECJ
version is used.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1829796&r1=1829795&r2=1829796&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Sun
Apr 22 19:02:29 2018
@@ -344,6 +344,10 @@ public class JDTCompiler extends org.apa
} else if(opt.equals("9") || opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_Source,
JDT_JAVA_9_VERSION);
+ } else if(opt.equals("10")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7
+ settings.put(CompilerOptions.OPTION_Source, "10");
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -395,6 +399,11 @@ public class JDTCompiler extends org.apa
JDT_JAVA_9_VERSION);
settings.put(CompilerOptions.OPTION_Compliance,
JDT_JAVA_9_VERSION);
+ } else if(opt.equals("10")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "10");
+ settings.put(CompilerOptions.OPTION_Compliance, "10");
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1829796&r1=1829795&r2=1829796&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Sun Apr 22 19:02:29 2018
@@ -85,6 +85,10 @@
Enable ECJ version 4.7 and later to be used as a drop in replacement
for
the ECJ version that ships with Apache Tomcat. (markt)
</fix>
+ <fix>
+ Enable Java 10 to be specified as a JSP source and/or target if a newer
+ ECJ version is used. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
