From 53f0ff17f947c6acaa86745a49c34a6cd34ce10f Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Sat, 26 Jun 2021 18:47:13 +0200 Subject: dev-java/tomcat-servlet-api: remove unused patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger Closes: https://github.com/gentoo/gentoo/pull/21438 Signed-off-by: Miroslav Šulc --- ...ut-aQute.bnd.annotation.spi.ServiceConsumer.patch | 20 -------------------- ...ut-aQute.bnd.annotation.spi.ServiceConsumer.patch | 20 -------------------- 2 files changed, 40 deletions(-) delete mode 100644 dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch delete mode 100644 dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch (limited to 'dev-java') diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch deleted file mode 100644 index 7dffca69ce67..000000000000 --- a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java -index 2f42de7..5d52580 100644 ---- a/java/jakarta/el/ExpressionFactory.java -+++ b/java/jakarta/el/ExpressionFactory.java -@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock; - import java.util.concurrent.locks.ReadWriteLock; - import java.util.concurrent.locks.ReentrantReadWriteLock; - --import aQute.bnd.annotation.spi.ServiceConsumer; -+//import aQute.bnd.annotation.spi.ServiceConsumer; - - /** - * - * @since 2.1 - */ --@ServiceConsumer(value=ExpressionFactory.class) -+//@ServiceConsumer(value=ExpressionFactory.class) - public abstract class ExpressionFactory { - - private static final boolean IS_SECURITY_ENABLED = diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch deleted file mode 100644 index 86e9eeb8f19f..000000000000 --- a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-9.0.40-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/java/javax/el/ExpressionFactory.java b/java/javax/el/ExpressionFactory.java -index 2f42de7..5d52580 100644 ---- a/java/javax/el/ExpressionFactory.java -+++ b/java/javax/el/ExpressionFactory.java -@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock; - import java.util.concurrent.locks.ReadWriteLock; - import java.util.concurrent.locks.ReentrantReadWriteLock; - --import aQute.bnd.annotation.spi.ServiceConsumer; -+//import aQute.bnd.annotation.spi.ServiceConsumer; - - /** - * - * @since 2.1 - */ --@ServiceConsumer(value=ExpressionFactory.class) -+//@ServiceConsumer(value=ExpressionFactory.class) - public abstract class ExpressionFactory { - - private static final boolean IS_SECURITY_ENABLED = -- cgit v1.2.3-65-gdbad