java-packages/tomcat
SHA256
8
0
Fork 2
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 696887 from home:mateialbu:branches:Java:packages

Browse Source 
- Update to Tomcat 9.0.19. See changelog at
  http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.19_(markt)
  Notable packaging changes:
  - File /usr/share/java/tomcat/catalina-jmx-remote.jar was removed.
    The classes contained in this jar were merged into 
    /usr/share/java/tomcat/catalina.jar.
- Fixed CVEs:
  - CVE-2019-0199 (bsc#1131055)
- Rebased patch:
  - tomcat-9.0-JDTCompiler-java.patch
  - tomcat-9.0-javadoc.patch

OBS-URL: https://build.opensuse.org/request/show/696887
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=161
This commit is contained in:
Matei Albu
2019-04-22 19:57:57 +00:00
committed by Git OBS Bridge
parent faa49568d9
commit 3e36252fe4
8 changed files with 94 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tomcat-9.0-JDTCompiler-java.patch
View File

@@ -1,11 +1,8 @@
Index: java/org/apache/jasper/compiler/JDTCompiler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
Index: apache-tomcat-9.0.19-src/java/org/apache/jasper/compiler/JDTCompiler.java
===================================================================
--- java/org/apache/jasper/compiler/JDTCompiler.java (revision 6bbf738a0e56d1793022b15e9aca9b690699216b)
+++ java/org/apache/jasper/compiler/JDTCompiler.java (date 1534261527000)
@@ -312,15 +312,16 @@
--- apache-tomcat-9.0.19-src.orig/java/org/apache/jasper/compiler/JDTCompiler.java
+++ apache-tomcat-9.0.19-src/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -312,18 +312,18 @@ public class JDTCompiler extends org.apa
CompilerOptions.VERSION_1_7);
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_Source,
@@ -16,18 +13,24 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
} else if(opt.equals("9") || opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+ "9");
+ "9"); // CompilerOptions.VERSION_9
} else if(opt.equals("10")) {
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+ "10");
+
} else {
log.warn("Unknown source VM " + opt + " ignored.");
+ "10"); // CompilerOptions.VERSION_10
} else if(opt.equals("11")) {
settings.put(CompilerOptions.OPTION_Source,
@@ -366,19 +367,19 @@
- CompilerOptions.VERSION_11);
+ "11"); // CompilerOptions.VERSION_11
} else if(opt.equals("12")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
@@ -377,26 +377,26 @@ public class JDTCompiler extends org.apa
CompilerOptions.VERSION_1_7);
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
- 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
@@ -36,17 +39,24 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
} else if(opt.equals("9") || opt.equals("1.9")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_9);
+ "9"); // CompilerOptions.VERSION_1_9
+ "9"); // CompilerOptions.VERSION_9
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_9);
+ "9"); // CompilerOptions.VERSION_1_9
+ "9"); // CompilerOptions.VERSION_9
} else if(opt.equals("10")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_10);
+ "10");
+ "10"); // CompilerOptions.VERSION_10
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_10);
+ "10");
} else {
log.warn("Unknown target VM " + opt + " ignored.");
+ "10"); // CompilerOptions.VERSION_10
} else if(opt.equals("11")) {
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_11);
+ "11"); // CompilerOptions.VERSION_11
settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_11);
+ "11"); // CompilerOptions.VERSION_11
} else if(opt.equals("12")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.