Index: apache-tomcat-9.0.115-src/java/org/apache/el/ExpressionFactoryImpl.java
===================================================================
--- apache-tomcat-9.0.115-src.orig/java/org/apache/el/ExpressionFactoryImpl.java
+++ apache-tomcat-9.0.115-src/java/org/apache/el/ExpressionFactoryImpl.java
@@ -31,7 +31,6 @@ import org.apache.el.util.MessageFactory
 /**
  * @see javax.el.ExpressionFactory
  */
-@aQute.bnd.annotation.spi.ServiceProvider(value = ExpressionFactory.class)
 public class ExpressionFactoryImpl extends ExpressionFactory {
 
     static {
Index: apache-tomcat-9.0.115-src/java/org/apache/tomcat/websocket/WsContainerProvider.java
===================================================================
--- apache-tomcat-9.0.115-src.orig/java/org/apache/tomcat/websocket/WsContainerProvider.java
+++ apache-tomcat-9.0.115-src/java/org/apache/tomcat/websocket/WsContainerProvider.java
@@ -19,7 +19,6 @@ package org.apache.tomcat.websocket;
 import javax.websocket.ContainerProvider;
 import javax.websocket.WebSocketContainer;
 
-@aQute.bnd.annotation.spi.ServiceProvider(value = ContainerProvider.class)
 public class WsContainerProvider extends ContainerProvider {
 
     @Override
Index: apache-tomcat-9.0.115-src/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
===================================================================
--- apache-tomcat-9.0.115-src.orig/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++ apache-tomcat-9.0.115-src/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -26,7 +26,6 @@ import javax.websocket.HandshakeResponse
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
 
-@aQute.bnd.annotation.spi.ServiceProvider(value = ServerEndpointConfig.Configurator.class)
 public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator {
 
     @Override
Index: apache-tomcat-9.0.115-src/java/org/apache/juli/logging/LogFactory.java
===================================================================
--- apache-tomcat-9.0.115-src.orig/java/org/apache/juli/logging/LogFactory.java
+++ apache-tomcat-9.0.115-src/java/org/apache/juli/logging/LogFactory.java
@@ -21,8 +21,6 @@ import java.nio.file.FileSystems;
 import java.util.ServiceLoader;
 import java.util.logging.LogManager;
 
-import aQute.bnd.annotation.spi.ServiceConsumer;
-
 /**
  * This is a modified LogFactory that uses a simple {@link ServiceLoader} based discovery mechanism with a default of
  * using JDK based logging. An implementation that uses the full Commons Logging discovery mechanism is available as
@@ -50,7 +48,6 @@ import aQute.bnd.annotation.spi.ServiceC
  * <strong>IMPLEMENTATION NOTE</strong> - This implementation is heavily based on the SAXParserFactory and
  * DocumentBuilderFactory implementations (corresponding to the JAXP pluggability APIs) found in Apache Xerces.
  */
-@ServiceConsumer(value = Log.class)
 public class LogFactory {
 
     private static final LogFactory singleton = new LogFactory();