1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: Fixes the compatibility with the version of the Eclipse compiler in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -328,13 +328,13 @@
} else if (opt.equals("20")) {
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_21);
+ settings.put(CompilerOptions.OPTION_Source, "21");
} else if (opt.equals("22")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_22);
+ settings.put(CompilerOptions.OPTION_Source, "22");
} else if (opt.equals("23")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_23);
+ settings.put(CompilerOptions.OPTION_Source, "23");
} else if (opt.equals("24")) {
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_24);
+ settings.put(CompilerOptions.OPTION_Source, "24");
} else if (opt.equals("25")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -411,17 +411,17 @@
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_20);
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_20);
} else if (opt.equals("21")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_21);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_21);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
+ settings.put(CompilerOptions.OPTION_Compliance, "21");
} else if (opt.equals("22")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_22);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_22);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
+ settings.put(CompilerOptions.OPTION_Compliance, "22");
} else if (opt.equals("23")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_23);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_23);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
+ settings.put(CompilerOptions.OPTION_Compliance, "23");
} else if (opt.equals("24")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_24);
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_24);
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "24");
+ settings.put(CompilerOptions.OPTION_Compliance, "24");
} else if (opt.equals("25")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
|
