[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     cbe74101070dc78e36a9351057c278df097418e6
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr  8 16:33:59 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr  9 06:17:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe74101

www-servers/tomcat: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20306
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/tomcat-9.0.40-insufficient-ecj.patch     | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
deleted file mode 100644
index dd002e2ca21..00000000000
--- a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
-index 4722a4a..27ce287 100644
---- a/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -307,7 +307,7 @@ 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")) {
-                 // Constant not available in latest ECJ version shipped with
-                 // Tomcat. May be supported in a snapshot build.
-@@ -368,8 +368,8 @@ 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")) {
-                 // Constant not available in latest ECJ version shipped with
-                 // Tomcat. May be supported in a snapshot build.