From 814f4cf860e299a046b649eaee5463427984c09c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Jul 2021 15:03:58 +0100 Subject: gentoo resync : 08.07.2021 --- .../files/tomcat-9.0.50-insufficient-ecj.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch (limited to 'www-servers/tomcat/files') diff --git a/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch new file mode 100644 index 000000000000..13e82c9c6517 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.50-insufficient-ecj.patch @@ -0,0 +1,40 @@ +diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java +index 10d80e0..34ff7e0 100644 +--- a/java/org/apache/jasper/compiler/JDTCompiler.java ++++ b/java/org/apache/jasper/compiler/JDTCompiler.java +@@ -306,11 +306,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { + } else if(opt.equals("13")) { + settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13); + } else if(opt.equals("14")) { +- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14); ++ settings.put(CompilerOptions.OPTION_Source, "14"); + } else if(opt.equals("15")) { +- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15); ++ settings.put(CompilerOptions.OPTION_Source, "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")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. +@@ -366,14 +366,14 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { + settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13); + settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13); + } else if(opt.equals("14")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14); +- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14); ++ settings.put(CompilerOptions.OPTION_TargetPlatform, "14"); ++ settings.put(CompilerOptions.OPTION_Compliance, "14"); + } else if(opt.equals("15")) { +- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15); +- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15); ++ settings.put(CompilerOptions.OPTION_TargetPlatform, "15"); ++ settings.put(CompilerOptions.OPTION_Compliance, "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")) { + // Constant not available in latest ECJ version shipped with + // Tomcat. May be supported in a snapshot build. -- cgit v1.2.3