Author: markt
Date: Fri Apr 20 12:40:42 2018
New Revision: 1829651
URL: http://svn.apache.org/viewvc?rev=1829651&view=rev
Log:
Add Java 10 support to the ECJ JSP compiler.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1829651&r1=1829650&r2=1829651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Fri Apr 20
12:40:42 2018
@@ -318,6 +318,9 @@ public class JDTCompiler extends org.apa
} else if(opt.equals("9") || opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_9);
+ } else if(opt.equals("10")) {
+ settings.put(CompilerOptions.OPTION_Source,
+ CompilerOptions.VERSION_10);
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -371,6 +374,11 @@ public class JDTCompiler extends org.apa
CompilerOptions.VERSION_9);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_9);
+ } else if(opt.equals("10")) {
+ settings.put(CompilerOptions.OPTION_TargetPlatform,
+ CompilerOptions.VERSION_10);
+ settings.put(CompilerOptions.OPTION_Compliance,
+ CompilerOptions.VERSION_10);
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1829651&r1=1829650&r2=1829651&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 20 12:40:42 2018
@@ -89,6 +89,15 @@
<update>
Update the Eclipse Compiler for Java to 4.7.3a. (markt)
</update>
+ <update>
+ Allow <code>9</code> to be used to specify Java 9 as the compiler
source
+ and/or compiler target for JSP compilation. The Early Access value of
+ <code>1.9</code> is still supported. (markt)
+ </update>
+ <add>
+ Add support for specifing Java 10 (with the value <code>10</code>) as
+ the compiler source and/or compiler target for JSP compilation. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
