58 lines
3.7 KiB
Diff
58 lines
3.7 KiB
Diff
diff -up ./java/org/apache/jasper/compiler/JDTCompiler.java.orig ./java/org/apache/jasper/compiler/JDTCompiler.java
|
|
--- ./java/org/apache/jasper/compiler/JDTCompiler.java.orig 2020-04-03 08:11:52.000000000 -0400
|
|
+++ ./java/org/apache/jasper/compiler/JDTCompiler.java 2020-04-22 16:03:04.710594419 -0400
|
|
@@ -324,24 +324,6 @@ public class JDTCompiler extends org.apa
|
|
} else if(opt.equals("11")) {
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
CompilerOptions.VERSION_11);
|
|
- } else if(opt.equals("12")) {
|
|
- settings.put(CompilerOptions.OPTION_Source,
|
|
- CompilerOptions.VERSION_12);
|
|
- } else if(opt.equals("13")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_Source, "13");
|
|
- } else if(opt.equals("14")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_Source, "14");
|
|
- } else if(opt.equals("15")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_Source, "15");
|
|
} else {
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
@@ -405,29 +387,6 @@ public class JDTCompiler extends org.apa
|
|
CompilerOptions.VERSION_11);
|
|
settings.put(CompilerOptions.OPTION_Compliance,
|
|
CompilerOptions.VERSION_11);
|
|
- } else if(opt.equals("12")) {
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
- CompilerOptions.VERSION_12);
|
|
- settings.put(CompilerOptions.OPTION_Compliance,
|
|
- CompilerOptions.VERSION_12);
|
|
- } else if(opt.equals("13")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
|
|
- settings.put(CompilerOptions.OPTION_Compliance, "13");
|
|
- } else if(opt.equals("14")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
|
|
- settings.put(CompilerOptions.OPTION_Compliance, "14");
|
|
- } else if(opt.equals("15")) {
|
|
- // Constant not available in latest ECJ version shipped with
|
|
- // Tomcat. May be supported in a snapshot build.
|
|
- // This is checked against the actual version below.
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
|
|
- settings.put(CompilerOptions.OPTION_Compliance, "15");
|
|
} else {
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|