64 lines
3.7 KiB
Diff
64 lines
3.7 KiB
Diff
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2020-04-21 13:14:09.678677327 -0400
|
|
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2020-04-21 13:14:53.044535302 -0400
|
|
@@ -313,25 +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 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 {
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
@@ -378,34 +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 if(opt.equals("11")) {
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
- 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 {
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|