tomcat/tomcat-9.0-JDTCompiler-java.patch

40 lines
2.1 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 (date 1506521372000)
+++ java/org/apache/jasper/compiler/JDTCompiler.java (revision )
@@ -312,10 +312,10 @@
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
} else if(opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_9);
+ "1.9"); // CompilerOptions.VERSION_1_9
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -359,14 +359,14 @@
CompilerOptions.VERSION_1_7);
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_8);
+ "1.8"); // CompilerOptions.VERSION_1_8
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_8);
+ "1.8"); // CompilerOptions.VERSION_1_8
} else if(opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_9);
+ "1.9"); // CompilerOptions.VERSION_1_9
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_9);
+ "1.9"); // CompilerOptions.VERSION_1_9
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,