2fb58ed407
- Update to Tomcat 9.0.10. See changelog at http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.10_(markt) - Fixed CVEs: - CVE-2018-1336 (bsc#1102400) - CVE-2018-8014 (bsc#1093697) - CVE-2018-8034 (bsc#1102379) - CVE-2018-8037 (bsc#1102410) - Rebased patch tomcat-9.0-JDTCompiler-java.patch - Added patch tomcat-9.0-disable-osgi-build.patch to disable adding OSGi metadata to JAR files OBS-URL: https://build.opensuse.org/request/show/629579 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=126
53 lines
2.8 KiB
Diff
53 lines
2.8 KiB
Diff
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,
|