2016-04-22 09:40:16 +00:00
|
|
|
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2016-04-22 11:13:13.194743602 +0200
|
|
|
|
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-04-22 11:17:02.457841335 +0200
|
|
|
|
@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa
|
2014-05-20 11:53:20 +00:00
|
|
|
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
|
2016-04-22 09:40:16 +00:00
|
|
|
} else if(opt.equals("1.9")) {
|
|
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
|
|
- CompilerOptions.VERSION_1_9);
|
|
|
|
+ "1.9"); // CompilerOptions.VERSION_1_9
|
2014-05-20 11:53:20 +00:00
|
|
|
} else {
|
|
|
|
log.warn("Unknown source VM " + opt + " ignored.");
|
|
|
|
settings.put(CompilerOptions.OPTION_Source,
|
2016-04-22 09:40:16 +00:00
|
|
|
@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa
|
2014-05-20 11:53:20 +00:00
|
|
|
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
|
2016-04-22 09:40:16 +00:00
|
|
|
} 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
|
2014-05-20 11:53:20 +00:00
|
|
|
} else {
|
|
|
|
log.warn("Unknown target VM " + opt + " ignored.");
|
|
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|