Remove some classes that are not provided by the bnd version shipped in el8

This reintroduces two upstream bugs dealing with metadata; see
https://bz.apache.org/bugzilla/show_bug.cgi?id=64849 & https://bz.apache.org/bugzilla/show_bug.cgi?id=64751

remove-bnd.annotation.spi-classes.patch

@@ -0,0 +1,53 @@
+diff -up ./java/org/apache/el/ExpressionFactoryImpl.java.orig ./java/org/apache/el/ExpressionFactoryImpl.java
+--- ./java/org/apache/el/ExpressionFactoryImpl.java.orig	2022-09-02 12:32:30.524315631 -0400
++++ ./java/org/apache/el/ExpressionFactoryImpl.java	2022-09-02 12:34:46.929889802 -0400
+@@ -33,7 +33,6 @@ import org.apache.el.util.MessageFactory
+  *
+  * @author Jacob Hookom [jacob@hookom.net]
+  */
+-@aQute.bnd.annotation.spi.ServiceProvider(value=ExpressionFactory.class)
+ public class ExpressionFactoryImpl extends ExpressionFactory {
+ 
+     @Override
+diff -up ./java/org/apache/juli/logging/LogFactory.java.orig ./java/org/apache/juli/logging/LogFactory.java
+--- ./java/org/apache/juli/logging/LogFactory.java.orig	2022-09-02 12:32:07.898220396 -0400
++++ ./java/org/apache/juli/logging/LogFactory.java	2022-09-02 12:32:20.824274802 -0400
+@@ -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
+@@ -63,7 +61,6 @@ import aQute.bnd.annotation.spi.ServiceC
+  * @author Costin Manolache
+  * @author Richard A. Sitze
+  */
+-@ServiceConsumer(value=org.apache.juli.logging.Log.class)
+ public class LogFactory {
+ 
+     private static final LogFactory singleton = new LogFactory();
+diff -up ./java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java.orig ./java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+--- ./java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java.orig	2022-09-02 12:29:50.926643837 -0400
++++ ./java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java	2022-09-02 12:30:09.789723245 -0400
+@@ -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 {
+ 
+diff -up ./java/org/apache/tomcat/websocket/WsContainerProvider.java.orig ./java/org/apache/tomcat/websocket/WsContainerProvider.java
+--- ./java/org/apache/tomcat/websocket/WsContainerProvider.java.orig	2022-09-02 12:30:19.813765442 -0400
++++ ./java/org/apache/tomcat/websocket/WsContainerProvider.java	2022-09-02 12:30:28.311801214 -0400
+@@ -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

tomcat.spec

@@ -82,6 +82,7 @@ Patch3:        %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
 Patch4:        rhbz-1857043.patch
 Patch5:        %{name}-%{major_version}.%{minor_version}-JDTCompiler.patch
 Patch6:        %{name}-%{major_version}.%{minor_version}-osgi-annotations.patch
+Patch7:        remove-bnd.annotation.spi-classes.patch
 
 BuildArch:     noarch
 %if 0%{?fedora} || 0%{?rhel} > 8
@@ -195,6 +196,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
+%patch7 -p0
 
 # Remove webservices naming resources as it's generally unused
 %{__rm} -rf java/org/apache/naming/factory/webservices
@@ -504,6 +506,7 @@ fi
 %changelog
 * Thu Sep 01 2022 Coty Sutherland <csutherl@redhat.com> - 1:9.0.65-2
 - Cleaning up some unused deps and system properties
+- Remove some classes that are not provided by the bnd version shipped in el8
 
 * Thu Jul 21 2022 Hui Wang <huwang@redhat.com> - 1:9.0.65-1
 - Update to 9.0.65