2025-08-14 08:00:45 +00:00
|
|
|
Index: apache-tomcat-11.0.9-src/java/org/apache/jasper/compiler/JDTCompiler.java
|
2025-04-24 04:32:40 +00:00
|
|
|
===================================================================
|
2025-08-14 08:00:45 +00:00
|
|
|
--- apache-tomcat-11.0.9-src.orig/java/org/apache/jasper/compiler/JDTCompiler.java
|
|
|
|
+++ apache-tomcat-11.0.9-src/java/org/apache/jasper/compiler/JDTCompiler.java
|
|
|
|
@@ -318,23 +318,23 @@ public class JDTCompiler extends org.apa
|
2025-04-24 04:32:40 +00:00
|
|
|
} else if (opt.equals("15")) {
|
|
|
|
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
|
|
|
|
} else if (opt.equals("16")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "16");
|
|
|
|
} else if (opt.equals("17")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "17");
|
|
|
|
} else if (opt.equals("18")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_18);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "18");
|
|
|
|
} else if (opt.equals("19")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_19);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "19");
|
|
|
|
} else if (opt.equals("20")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_20);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "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")) {
|
2025-08-14 08:00:45 +00:00
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_24);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "24");
|
|
|
|
} else if (opt.equals("25")) {
|
2025-04-24 04:32:40 +00:00
|
|
|
// Constant not available in latest ECJ version shipped with
|
|
|
|
// Tomcat. May be supported in a snapshot build.
|
2025-08-14 08:00:45 +00:00
|
|
|
@@ -342,11 +342,11 @@ public class JDTCompiler extends org.apa
|
2025-04-24 04:32:40 +00:00
|
|
|
settings.put(CompilerOptions.OPTION_Source, "25");
|
|
|
|
} else {
|
|
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "17");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Default to 17
|
|
|
|
- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Source, "17");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Target JVM
|
2025-08-14 08:00:45 +00:00
|
|
|
@@ -396,32 +396,32 @@ public class JDTCompiler extends org.apa
|
2025-04-24 04:32:40 +00:00
|
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
|
|
|
|
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
|
|
|
|
} else if (opt.equals("16")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "16");
|
|
|
|
} else if (opt.equals("17")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "17");
|
|
|
|
} else if (opt.equals("18")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_18);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_18);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "18");
|
|
|
|
} else if (opt.equals("19")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_19);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_19);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "19");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "19");
|
|
|
|
} else if (opt.equals("20")) {
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_20);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_20);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "20");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "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")) {
|
2025-08-14 08:00:45 +00:00
|
|
|
- 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")) {
|
2025-04-24 04:32:40 +00:00
|
|
|
// Constant not available in latest ECJ version shipped with
|
|
|
|
// Tomcat. May be supported in a snapshot build.
|
2025-08-14 08:00:45 +00:00
|
|
|
@@ -430,12 +430,12 @@ public class JDTCompiler extends org.apa
|
2025-04-24 04:32:40 +00:00
|
|
|
settings.put(CompilerOptions.OPTION_Compliance, "25");
|
|
|
|
} else {
|
|
|
|
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Default to 17
|
|
|
|
- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_17);
|
|
|
|
- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_17);
|
|
|
|
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
|
|
|
|
+ settings.put(CompilerOptions.OPTION_Compliance, "17");
|
|
|
|
}
|
|
|
|
|
|
|
|
final IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault());
|