37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
|
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-31 17:05:49.639378409 -0400
|
||
|
|
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 17:06:36.947209122 -0400
|
||
|
|
@@ -313,14 +313,6 @@ public class JDTCompiler extends org.apa
|
||
|
|
} else if(opt.equals("1.8")) {
|
||
|
|
settings.put(CompilerOptions.OPTION_Source,
|
||
|
|
CompilerOptions.VERSION_1_8);
|
||
|
|
- // Version format changed from Java 9 onwards.
|
||
|
|
- // Support old format that was used in EA implementation as well
|
||
|
|
- } 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,
|
||
|
|
@@ -367,18 +359,6 @@ public class JDTCompiler extends org.apa
|
||
|
|
CompilerOptions.VERSION_1_8);
|
||
|
|
settings.put(CompilerOptions.OPTION_Compliance,
|
||
|
|
CompilerOptions.VERSION_1_8);
|
||
|
|
- // Version format changed from Java 9 onwards.
|
||
|
|
- // Support old format that was used in EA implementation as well
|
||
|
|
- } else if(opt.equals("9") || opt.equals("1.9")) {
|
||
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform,
|
||
|
|
- 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,
|