tomcat/tomcat-9.0-JDTCompiler-java.patch

53 lines
2.8 KiB
Diff
Raw Normal View History

Index: java/org/apache/jasper/compiler/JDTCompiler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- java/org/apache/jasper/compiler/JDTCompiler.java (revision 6bbf738a0e56d1793022b15e9aca9b690699216b)
+++ java/org/apache/jasper/compiler/JDTCompiler.java (date 1534261527000)
@@ -312,15 +312,16 @@
CompilerOptions.VERSION_1_7);
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+ "1.8"); // 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);
+ "9");
} else if(opt.equals("10")) {
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+ "10");
+
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -366,19 +367,19 @@
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_8);
+ "1.8"); // 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);
+ "9"); // CompilerOptions.VERSION_1_9
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_9);
+ "9"); // CompilerOptions.VERSION_1_9
} else if(opt.equals("10")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_10);
+ "10");
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_10);
+ "10");
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,