summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2021-02-04 11:07:48 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2021-02-04 11:07:48 +0100
commit71b2ce1d92c9c9001cfff8c73d1d48df0a1fcf9e (patch)
treec6f9855bdca494f4130ef0f5b811ee79fcad69bc /www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
parentdev-java/tomcat-servlet-api: bump to 9.0.43 (diff)
downloadgentoo-71b2ce1d92c9c9001cfff8c73d1d48df0a1fcf9e.tar.gz
gentoo-71b2ce1d92c9c9001cfff8c73d1d48df0a1fcf9e.tar.bz2
gentoo-71b2ce1d92c9c9001cfff8c73d1d48df0a1fcf9e.zip
www-servers/tomcat: bump to 9.0.43
Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch')
-rw-r--r--www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
new file mode 100644
index 000000000000..49276c775be8
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.43-insufficient-ecj.patch
@@ -0,0 +1,32 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
+index ebc00f6..df22856 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -306,9 +306,9 @@ 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")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.
+@@ -364,11 +364,11 @@ 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")) {
+ // Constant not available in latest ECJ version shipped with
+ // Tomcat. May be supported in a snapshot build.