27 changed files with 467 additions and 425 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,4 @@
-SOURCES/tomcat-9.0.50.redhat-00006-src.zip
+apache-tomcat-*-src.tar.gz
+*tomcat-*-src*
+*.src.rpm
+results_pki-servlet-engine
--- a/.pki-servlet-engine.metadata
+++ b/.pki-servlet-engine.metadata
@ -1 +0,0 @@
-d3342fad0113532635b6d2ec733e189abeadaf0d SOURCES/tomcat-9.0.50.redhat-00006-src.zip
--- a/0001-ascheel-Update-to-JDK-Version-11.patch
+++ b/0001-ascheel-Update-to-JDK-Version-11.patch
@ -0,0 +1,32 @@
+From 6cfbaebf60aa4410501ea6c94e65d3df195b2d56 Mon Sep 17 00:00:00 2001
+From: Alexander Scheel <ascheel@redhat.com>
+Date: Thu, 25 Feb 2021 08:35:51 -0500
+Subject: [PATCH] Update to JDK Version 11
+
+Signed-off-by: Alexander Scheel <ascheel@redhat.com>
+---
+ build.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 37710fd..6664b7a 100644
+--- a/build.xml
+++ b/build.xml
+@@ -90,10 +90,10 @@
+   <property name="tomcat.pool"           value="${tomcat.output}/jdbc-pool"/>
+ 
+   <!-- Servlet 4.0 spec requires Java 8+ -->
+-  <property name="compile.source" value="8"/>
+-  <property name="compile.target" value="8"/>
+-  <property name="compile.release" value="8"/>
+-  <property name="min.java.version" value="8"/>
+  <property name="compile.source" value="11"/>
+  <property name="compile.target" value="11"/>
+  <property name="compile.release" value="11"/>
+  <property name="min.java.version" value="11"/>
+ 
+   <!-- Locations to create the JAR artifacts -->
+   <!-- Standard JARs -->
+-- 
+2.29.2
+
--- a/SOURCES/removeUnusedDependencies.patch
+++ b/SOURCES/removeUnusedDependencies.patch
@ -1,303 +0,0 @@
--- build.xml.orig	2021-12-09 13:29:38.000000000 -0500
-+++ build.xml	2022-06-24 15:11:09.283008874 -0400
-@@ -73,7 +73,6 @@
-   <property name="tomcat.home"           value="${basedir}"/>
-   <property name="tomcat-nb.home"        value="${basedir}/nbproject" />
-   <property name="tomcat.output"         value="${basedir}/output"/>
-  <property name="tomcat.bnd"            value="${basedir}/res/bnd"/>
-   <property name="tomcat.build"          value="${tomcat.output}/build"/>
-   <property name="tomcat.classes"        value="${tomcat.output}/classes"/>
-   <property name="tomcat.deployer"       value="${tomcat.output}/deployer"/>
-@@ -239,11 +238,6 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-    <pathelement location="${bnd.jar}"/>
-    <pathelement location="${osgi-annotations.jar}"/>
-    <pathelement location="${jdt.jar}"/>
-    <pathelement location="${jaxrpc-lib.jar}"/>
-    <pathelement location="${wsdl4j-lib.jar}"/>
-     <!-- ant.jar reference for maven build to use -->
-     <pathelement location="${ant.jar}"/>
-   </path>
-@@ -298,7 +292,6 @@
-     <include name="**/javax.websocket.ContainerProvider"/>
-     <include name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
-     <include name="**/.gitignore"/>
-    <include name="**/*.bnd"/>
-     <include name="**/*.classpath"/>
-     <include name="**/*.css"/>
-     <include name="**/*.dtd"/>
-@@ -453,6 +446,7 @@
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/catalina/storeconfig/**" />
-     <exclude name="org/apache/catalina/ssi/**" />
-+    <exclude name="org/apache/naming/factory/webservices/**" />
-   </patternset>
- 
-   <patternset id="files.tomcat-embed-programmatic">
-@@ -964,7 +958,7 @@
-     </copy>
-   </target>
- 
-  <target name="compile" depends="build-prepare,compile-prepare,setup-bnd">
-+  <target name="compile" depends="build-prepare,compile-prepare">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -978,6 +972,7 @@
-       -->
-       <compilerarg value="-XDignore.symbol.file"/>
-       <classpath refid="compile.classpath" />
-+      <exclude name="org/apache/naming/factory/webservices/**" />
-     </javac>
-     <!-- Copy static resource files -->
-     <copy todir="${tomcat.classes}" encoding="UTF-8">
-@@ -1032,7 +1027,7 @@
-       filesDir="${tomcat.classes}"
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
-      addOSGi="true" />
-+      />
- 
-     <!-- Servlet Implementation JAR File -->
-     <jarIt jarfile="${servlet-api.jar}"
-@@ -1041,41 +1036,41 @@
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license"
-      addOSGi="true" />
-+      />
- 
-     <!-- EL Implementation JAR File -->
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest"
-      addOSGi="true" />
-+      />
- 
-     <!-- JSP Implementation JAR File -->
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
-      addOSGi="true" />
-+      />
- 
-     <!-- WebSocket API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.websocket-api"
-       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
-      addOSGi="true" />
-+      />
- 
-     <!-- JASPIC API JAR File -->
-     <jarIt jarfile="${jaspic-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jaspic-api"
-       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
-      addOSGi="true" />
-+      />
- 
-     <!-- Tomcat-juli JAR File -->
-     <jarIt jarfile="${tomcat-juli.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-juli"
-      addOSGi="true" />
-+      />
- 
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-@@ -1087,61 +1082,61 @@
-     <jarIt jarfile="${tomcat-util.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util"
-      addOSGi="true" />
-+      />
- 
-     <!-- Tomcat API JAR File -->
-     <jarIt jarfile="${tomcat-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-api"
-      addOSGi="true" />
-+      />
- 
-     <!-- Tomcat Util Scan JAR File -->
-     <jarIt jarfile="${tomcat-util-scan.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-util-scan"
-      addOSGi="true" />
-+      />
- 
-     <jarIt jarfile="${tomcat-jni.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-jni"
-      addOSGi="true" />
-+      />
- 
-     <!-- Protocol handlers - Coyote -->
-     <jarIt jarfile="${tomcat-coyote.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-coyote"
-      addOSGi="true" />
-+      />
- 
-     <!-- WebSocket implementation JAR File -->
-     <jarIt jarfile="${tomcat-websocket.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-websocket"
-       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
-      addOSGi="true" />
-+      />
- 
-     <!-- Catalina GroupCom/Tribes JAR File -->
-     <jarIt jarfile="${catalina-tribes.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-tribes"
-      addOSGi="true" />
-+      />
- 
-     <!-- Catalina Main JAR File -->
-     <jarIt jarfile="${catalina.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina"
-      addOSGi="true" />
-+      />
- 
-     <!-- Catalina Cluster/HA JAR File -->
-     <jarIt jarfile="${catalina-ha.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ha"
-      addOSGi="true" />
-+      />
- 
-     <!-- Server-Side Includes (SSI) -->
-     <jarIt jarfile="${catalina-ssi.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-ssi"
-      addOSGi="true" />
-+      />
- 
-     <!-- Catalina Ant Tasks JAR File -->
-     <jarIt jarfile="${catalina-ant.jar}"
-@@ -1152,27 +1147,27 @@
-     <jarIt jarfile="${catalina-storeconfig.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.catalina-storeconfig"
-      addOSGi="true" />
-+      />
- 
-     <!-- Jasper EL Implementation JAR File -->
-     <jarIt jarfile="${jasper-el.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper-el"
-       meta-inf="${tomcat.manifests}/jasper-el.jar"
-      addOSGi="true" />
-+      />
- 
-     <!-- Jasper Implementation JAR File -->
-     <jarIt jarfile="${jasper.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jasper"
-       meta-inf="${tomcat.manifests}/jasper.jar"
-      addOSGi="true" />
-+      />
- 
-     <!-- Re-packaged Apache Commons DBCP 2-->
-     <jarIt jarfile="${tomcat-dbcp.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.tomcat-dbcp"
-      addOSGi="true" />
-+      />
- 
-     <!-- i18n JARs -->
-     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1616,7 +1611,7 @@
-     </txt2html>
-   </target>
-   <target name="embed-jars" description="Create experimental embedded jars"
-    depends="build-manifests,setup-bnd,compile,package" >
-+    depends="build-manifests,compile,package" >
- 
-     <mkdir dir="${tomcat.embed}" />
- 
-@@ -3137,7 +3132,7 @@ skip.installer property in build.propert
- 
-   <target name="download-compile"
-           description="Download components necessary to compile"
-          depends="setup-bnd">
-+          >
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -3712,15 +3707,6 @@ Read the Building page on the Apache Tom
-     </antcall>
-   </target>
- 
-  <target name="setup-bnd" >
-    <!-- Add bnd tasks to project -->
-    <path id="bnd.classpath">
-      <fileset file="${bnd.jar}" />
-    </path>
-
-    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
-  </target>
-
-   <macrodef name="jarIt" description="utility macro for standard JAR packaging">
-     <attribute name="jarfile"
-                description="the name of the JAR file to create"/>
-diff -up ./java/org/apache/el/ExpressionFactoryImpl.java.orig ./java/org/apache/el/ExpressionFactoryImpl.java
--- ./java/org/apache/el/ExpressionFactoryImpl.java.orig	2022-06-24 15:17:45.976566618 -0400
-+++ ./java/org/apache/el/ExpressionFactoryImpl.java	2022-06-24 15:17:51.346506484 -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-06-24 15:17:21.628839270 -0400
-+++ ./java/org/apache/juli/logging/LogFactory.java	2022-06-24 15:17:37.625660134 -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-06-24 15:17:09.250977880 -0400
-+++ ./java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java	2022-06-24 15:17:14.091923670 -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-06-24 15:16:58.046103352 -0400
-+++ ./java/org/apache/tomcat/websocket/WsContainerProvider.java	2022-06-24 15:17:03.098046783 -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
--- a/exclude-OSGi-metadata.patch
+++ b/exclude-OSGi-metadata.patch
@ -0,0 +1,208 @@
+diff -up ./build.xml.orig ./build.xml
+--- ./build.xml.orig	2021-12-09 13:29:38.000000000 -0500
+++ ./build.xml	2022-03-04 08:56:31.987572758 -0500
+@@ -1032,7 +1032,7 @@
+       filesDir="${tomcat.classes}"
+       filesId="files.annotations-api"
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Servlet Implementation JAR File -->
+     <jarIt jarfile="${servlet-api.jar}"
+@@ -1041,41 +1041,41 @@
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- EL Implementation JAR File -->
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- JSP Implementation JAR File -->
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.websocket-api"
+       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- JASPIC API JAR File -->
+     <jarIt jarfile="${jaspic-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jaspic-api"
+       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Tomcat-juli JAR File -->
+     <jarIt jarfile="${tomcat-juli.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-juli"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -1087,61 +1087,61 @@
+     <jarIt jarfile="${tomcat-util.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-util"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Tomcat API JAR File -->
+     <jarIt jarfile="${tomcat-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-api"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Tomcat Util Scan JAR File -->
+     <jarIt jarfile="${tomcat-util-scan.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-util-scan"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <jarIt jarfile="${tomcat-jni.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-jni"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Protocol handlers - Coyote -->
+     <jarIt jarfile="${tomcat-coyote.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-coyote"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- WebSocket implementation JAR File -->
+     <jarIt jarfile="${tomcat-websocket.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-websocket"
+       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Catalina GroupCom/Tribes JAR File -->
+     <jarIt jarfile="${catalina-tribes.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-tribes"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Catalina Main JAR File -->
+     <jarIt jarfile="${catalina.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Catalina Cluster/HA JAR File -->
+     <jarIt jarfile="${catalina-ha.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-ha"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Server-Side Includes (SSI) -->
+     <jarIt jarfile="${catalina-ssi.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-ssi"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Catalina Ant Tasks JAR File -->
+     <jarIt jarfile="${catalina-ant.jar}"
+@@ -1152,27 +1152,27 @@
+     <jarIt jarfile="${catalina-storeconfig.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.catalina-storeconfig"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Jasper EL Implementation JAR File -->
+     <jarIt jarfile="${jasper-el.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jasper-el"
+       meta-inf="${tomcat.manifests}/jasper-el.jar"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Jasper Implementation JAR File -->
+     <jarIt jarfile="${jasper.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jasper"
+       meta-inf="${tomcat.manifests}/jasper.jar"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+     <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
+      addOSGi="false" />
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1635,7 +1635,7 @@
+            filesId="files.tomcat-embed-core"
+            notice="${tomcat.manifests}/servlet-api.jar.notice"
+            license="${tomcat.manifests}/servlet-api.jar.license"
+-           addOSGi="true"
+           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
+            graalFiles="res/graal/tomcat-embed-core/native-image"
+@@ -1643,7 +1643,7 @@
+     <jarIt jarfile="${tomcat-embed-el.jar}"
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-el"
+-           addOSGi="true"
+           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
+            graalFiles="res/graal/tomcat-embed-el/native-image"
+@@ -1652,7 +1652,7 @@
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-jasper"
+            meta-inf="${tomcat.manifests}/jasper.jar"
+-           addOSGi="true"
+           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
+            graalFiles="res/graal/tomcat-embed-jasper/native-image"
+@@ -1661,7 +1661,7 @@
+            filesDir="${tomcat.classes}"
+            filesId="files.tomcat-embed-websocket"
+            meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+-           addOSGi="true"
+           addOSGi="false"
+            addGraal="true"
+            graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
+            graalFiles="res/graal/tomcat-embed-websocket/native-image"
+@@ -3716,6 +3716,7 @@ Read the Building page on the Apache Tom
+     <!-- Add bnd tasks to project -->
+     <path id="bnd.classpath">
+       <fileset file="${bnd.jar}" />
+      <fileset file="${bndannotation.jar}" />
+     </path>
+ 
+     <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,7 @@
+# recipients: rhcs-team
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/SPECS/pki-servlet-engine.spec
+++ b/SPECS/pki-servlet-engine.spec
@ -80,36 +80,38 @@ Source32:      tomcat-named.service
 Patch0:        tomcat-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        tomcat-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 Patch2:        tomcat-%{major_version}.%{minor_version}-catalina-policy.patch
-Patch3:        removeUnusedDependencies.patch
+Patch3:        exclude-OSGi-metadata.patch

 BuildArch:     noarch

 BuildRequires: ant
 BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
-BuildRequires: jpackage-utils >= 0:1.7.0
-BuildRequires: maven-local
-BuildRequires: systemd-units
+BuildRequires: java-11-devel
+BuildRequires: javapackages-tools
+BuildRequires: javapackages-local
+BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
+BuildRequires: aqute-bnd
+BuildRequires: aqute-bndlib

 Requires:      ant
-Requires:      java-headless >= 1:1.8.0
-Requires:      java-devel >= 1:1.8.0
-Requires:      jpackage-utils
+Requires:      java-11-devel
+Requires:      javapackages-tools
 Requires:      procps
 Requires(pre):    shadow-utils
 Requires(post):   chkconfig
 Requires(postun): chkconfig
 Requires(preun):  chkconfig
-Requires(post):   systemd-units
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
 Requires(preun): coreutils
 Requires: pki-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}

-# Add bundled so that everyone knows this is Tomcat
-Provides: bundled(tomcat) = 9.0.30.redhat-%{redhat_version}
+# Add bundled so that everyone knows this is Tomcat.
+Provides: bundled(tomcat) = %{version}.redhat-%{redhat_version}

-Obsoletes:        pki-servlet-container
+Obsoletes:        pki-servlet-container <= 9.0.7

 %description
 Tomcat is the servlet engine that is used in the official Reference
@ -144,6 +146,12 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "

 # Since we don't support ECJ in RHEL anymore, remove the class that requires it
 %{__rm} -f java/org/apache/jasper/compiler/JDTCompiler.java
+# Also remove webservices naming factory as it's unused and causes unnecessary dependencies to be required
+%{__rm} -rf java/org/apache/naming/factory/webservices
+
+# Configure maven files
+%mvn_package ":tomcat-servlet-api" tomcat-servlet-api
+

 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
@ -161,6 +169,12 @@ touch HACK
  -Dtomcat-native.home="." \
  -Dcommons-daemon.native.win.mgr.exe="HACK" \
  -Dnsis.exe="HACK" \
+  -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \
+  -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \
+  -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \
+  -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
+  -Dosgi-annotations.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \
+  -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \
  deploy dist-prepare dist-source

 # remove some jars that we don't need
@ -248,9 +262,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
    %{__ln_s} ../../java/tomcat-jsp-%{jspspec}-api.jar .
    %{__ln_s} ../../java/tomcat-servlet-%{servletspec}-api.jar .
    %{__ln_s} ../../java/tomcat-el-%{elspec}-api.jar .
-
-    # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
-    %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./
 popd

 # symlink to the FHS locations where we've installed things
@ -264,77 +275,15 @@ pushd ${RPM_BUILD_ROOT}%{homedir}
 popd

 # Install the maven metadata
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
-pushd output/dist/src/res/maven
-for pom in *.pom; do
-    # fix-up version in all pom files
-    sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
-done
+pushd res/maven
+    for pom in *.pom; do
+        # fix-up version in all pom files
+        sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
+    done
+popd

-# we won't install dbcp, juli-adapters and juli-extras pom files
-for libname in annotations-api catalina jasper-el jasper catalina-ha; do
-    %{__cp} -a tomcat-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-$libname.pom
-    %add_maven_depmap JPP.tomcat-$libname.pom tomcat/$libname.jar
-done
-
-# tomcat-util-scan
-%{__cp} -a tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-util-scan.pom
-%add_maven_depmap JPP.tomcat-util-scan.pom tomcat/tomcat-util-scan.jar
-
-# tomcat-jni
-%{__cp} -a tomcat-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-jni.pom
-%add_maven_depmap JPP.tomcat-jni.pom tomcat/tomcat-jni.jar
-
-# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
-%{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
-
-%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -a "org.eclipse.jetty.orbit:javax.el"
-
-%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
-# Generate a depmap fragment javax.servlet:servlet-api pointing to
-# tomcat-servlet-3.0-api for backwards compatibility
-# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
-%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-%{servletspec}-api.jar -f "tomcat-servlet-api"
-
-# replace temporary copy with link
-%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
-
-# two special pom where jar files have different names
-%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-catalina-tribes.pom
-%add_maven_depmap JPP.tomcat-catalina-tribes.pom tomcat/catalina-tribes.jar
-
-%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-coyote.pom
-%add_maven_depmap JPP.tomcat-tomcat-coyote.pom tomcat/tomcat-coyote.jar
-
-%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-juli.pom
-%add_maven_depmap JPP.tomcat-tomcat-juli.pom tomcat/tomcat-juli.jar
-
-%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-api.pom
-%add_maven_depmap JPP.tomcat-tomcat-api.pom tomcat/tomcat-api.jar
-
-%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-util.pom
-%add_maven_depmap JPP.tomcat-tomcat-util.pom tomcat/tomcat-util.jar
-
-%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-jdbc.pom
-%add_maven_depmap JPP.tomcat-tomcat-jdbc.pom tomcat/tomcat-jdbc.jar
-
-# tomcat-websocket-api
-%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-websocket-api.pom
-%add_maven_depmap JPP.tomcat-websocket-api.pom tomcat/websocket-api.jar
-
-# tomcat-tomcat-websocket
-%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-tomcat-websocket.pom
-%add_maven_depmap JPP.tomcat-tomcat-websocket.pom tomcat/tomcat-websocket.jar
-
-# tomcat-jaspic-api
-%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.tomcat-jaspic-api.pom
-%add_maven_depmap JPP.tomcat-jaspic-api.pom tomcat/jaspic-api.jar
-
-# Manually change the metadata filenames
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/%{name}.xml ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/tomcat.xml
-%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/%{name}-tomcat-servlet-api.xml ${RPM_BUILD_ROOT}%{_datadir}/maven-metadata/tomcat-servlet-api.xml
+%mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar
+%mvn_install

 %pre
 # add the tomcat user and group
@ -372,7 +321,7 @@ if [ "$1" = "0" ]; then
        %{_javadir}/tomcat-el-%{elspec}-api.jar
 fi

-%files 
+%files
 %defattr(0664,root,tomcat,0755)
 %doc {LICENSE,NOTICE,RELEASE*}
 %attr(0755,root,root) %{_bindir}/tomcat-digest
@ -428,44 +377,41 @@ fi
 %{libdir}/*.jar
 %{_javadir}/*.jar
 %{bindir}/tomcat-juli.jar
-%{_mavenpomdir}/JPP.tomcat-annotations-api.pom
-%{_mavenpomdir}/JPP.tomcat-catalina-ha.pom
-%{_mavenpomdir}/JPP.tomcat-catalina-tribes.pom
-%{_mavenpomdir}/JPP.tomcat-catalina.pom
-%{_mavenpomdir}/JPP.tomcat-jasper-el.pom
-%{_mavenpomdir}/JPP.tomcat-jasper.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-api.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-juli.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-coyote.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-util.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-jdbc.pom
-%{_mavenpomdir}/JPP.tomcat-websocket-api.pom
-%{_mavenpomdir}/JPP.tomcat-tomcat-websocket.pom
-%{_mavenpomdir}/JPP.tomcat-jaspic-api.pom
-%{_mavenpomdir}/JPP.tomcat-jni.pom
-%{_mavenpomdir}/JPP.tomcat-util-scan.pom
-%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
-%{_mavenpomdir}/JPP-tomcat-el-api.pom
-%{_datadir}/maven-metadata/tomcat.xml
 %exclude %{_javadir}/tomcat-servlet-%{servletspec}*.jar

-%files -n pki-servlet-%{servletspec}-api
+%files -n pki-servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_javadir}/tomcat-servlet-%{servletspec}*.jar
-%{_datadir}/maven-metadata/tomcat-servlet-api.xml
-%{_mavenpomdir}/JPP-tomcat-servlet-api.pom

 %changelog
-* Fri Mar 04 2022 Coty Sutherland <csutherl@redhat.com> - 1:9.0.50-1
- Update to JWS 5.6.1 distribution
- Resolves: rhbz#2057162 Rebase pki-servlet-engine to 9.0.50
+* Thu Feb 24 2022 Chris Kelley <ckelley@redhat.com> - 1:9.0.50-1
+- Update to JWS 5.6.1

-* Fri Jun 11 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-3
- Reverts: rhbz#1969366 as it causes other issues
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:9.0.43-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

-* Tue Jun 08 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-2
- Resolves: rhbz#1969366 CA instance installation fails with error message
+* Tue Jul 13 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.43-3
+- Add back ant runtime dependency to allow compilation of JSPs at runtime (no ECJ support)
+
+* Fri Jul 09 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.43-2
+- Related: rhbz#1977948 Cleanup unused tomcat-juli.jar copy now that the maven artifacts have been removed
+
+* Thu Jul 08 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.43-1
+- Update to JWS 5.5, and drop jakarta-saaj dependency
+- Updates to javapackages-local removed %%add_maven_depmap which broke the build,
+  so I removed most of the maven artifacts as they aren't very useful anyway
+- Cleaned up a few unnecessary patches
+
+* Tue Jun 08 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-3
+- Resolves: rhbz#1963851 CA instance installation fails with error message
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:9.0.30-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Feb 03 2021 Alexander Scheel <ascheel@redhat.com> - 1:9.0.30-2
+- Rebuild for RHEL 9

 * Thu Apr 23 2020 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-1
 - Resolves: rhbz#1721684 Rebase pki-servlet-engine to 9.0.30
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (tomcat-9.0.50.redhat-00006-src.zip) = 15492c8102a4e21e413e92264e05939cd38e4832a84ad842459e4f3d0b0abb3a9e9eeb3b39fcaff3ebac9098eb882692f8fa3ea20f2471c65d90040ff277dfe9
--- a/tests/roles/Test_Setup/files/ca.cfg
+++ b/tests/roles/Test_Setup/files/ca.cfg
@ -0,0 +1,25 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[CA]
+pki_admin_email=caadmin@example.com
+pki_admin_name=caadmin
+pki_admin_nickname=caadmin
+pki_admin_password=Secret.123
+pki_admin_uid=caadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
+pki_ds_database=ca
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+
+pki_ca_signing_nickname=ca_signing
+pki_ocsp_signing_nickname=ca_ocsp_signing
+pki_audit_signing_nickname=ca_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem
--- a/tests/roles/Test_Setup/files/ds-create.sh
+++ b/tests/roles/Test_Setup/files/ds-create.sh
@ -0,0 +1,24 @@
+#!/bin/bash -ex
+
+# This command needs to be executed as it pulls the machine name
+# dynamically.
+dscreate create-template /tmp/test_dir/ds.inf
+
+sed -i \
+    -e "s/;instance_name = .*/instance_name = localhost/g" \
+    -e "s/;root_password = .*/root_password = Secret.123/g" \
+    -e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
+    -e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
+    /tmp/test_dir/ds.inf
+
+dscreate from-file /tmp/test_dir/ds.inf
+
+ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
+dn: dc=example,dc=com
+objectClass: domain
+dc: example
+
+dn: dc=pki,dc=example,dc=com
+objectClass: domain
+dc: pki
+EOF
--- a/tests/roles/Test_Setup/files/kra.cfg
+++ b/tests/roles/Test_Setup/files/kra.cfg
@ -0,0 +1,27 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[KRA]
+pki_admin_email=kraadmin@example.com
+pki_admin_name=kraadmin
+pki_admin_nickname=kraadmin
+pki_admin_password=Secret.123
+pki_admin_uid=kraadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
+pki_ds_database=kra
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+pki_security_domain_user=caadmin
+pki_security_domain_password=Secret.123
+
+pki_storage_nickname=kra_storage
+pki_transport_nickname=kra_transport
+pki_audit_signing_nickname=kra_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem
--- a/tests/roles/Test_Setup/tasks/main.yml
+++ b/tests/roles/Test_Setup/tasks/main.yml
@ -0,0 +1,26 @@
+---
+
+- name: Install resteasy packages
+  dnf:
+    name: >
+      pki-resteasy-client, pki-resteasy-core, pki-resteasy-jackson2-provider, pki-resteasy-jaxb-provider
+
+- name: Install required packages
+  dnf:
+    name: >
+      389-ds-base, pki-ca, pki-kra
+
+- name: Creates directory
+  file: path=/tmp/test_files state=directory
+
+- name: Copying templates to /tmp folder
+  copy : src=.  dest=/tmp/test_dir
+
+- name: Setup DS Service
+  shell: sh /tmp/test_dir/ds-create.sh
+
+- name: Install CA subsystem
+  shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v
+
+- name: Install KRA subsystem
+  shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,29 @@
+- hosts: localhost
+  remote_user: root
+  tags:
+    - classic
+  roles:
+  - role: Test_Setup
+  - role: standard-test-basic
+    tests:
+    - verify_spawn_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
+    - verify_spawn_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
+    - destroy_kra:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"
+    - verify_destroy_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'"
+    - destroy_ca:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s CA"
+    - verify_destroy_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus  &> testfile.log || true && grep 'Connection refused' testfile.log"
+    required_packages:
+    - pki-ca
+    - pki-kra
--- a/SOURCES/tomcat-9.0-bootstrap-MANIFEST.MF.patch
+++ b/SOURCES/tomcat-9.0-bootstrap-MANIFEST.MF.patch
--- a/SOURCES/tomcat-9.0-catalina-policy.patch
+++ b/SOURCES/tomcat-9.0-catalina-policy.patch
@ -1,9 +1,16 @@
--- conf/catalina.policy.orig	2021-12-09 13:29:38.000000000 -0500
-+++ conf/catalina.policy	2022-06-24 14:57:25.418254977 -0400
-@@ -56,6 +56,30 @@ grant codeBase "file:${java.home}/lib/ex
+diff -up ./conf/catalina.policy.orig ./conf/catalina.policy
+--- ./conf/catalina.policy.orig	2022-03-04 08:49:08.246538215 -0500
+++ ./conf/catalina.policy	2022-03-04 08:50:31.842356329 -0500
+@@ -56,6 +56,36 @@ grant codeBase "file:${java.home}/lib/ex
 //        permission java.security.AllPermission;
 //};
 
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+grant codeBase "jrt:/jdk.compiler" {
+        permission java.security.AllPermission;
+};
+
 +// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
 +
 +// Allowing everything in /usr/share/java allows too many unknowns to be permitted
--- a/SOURCES/tomcat-9.0-digest.script
+++ b/SOURCES/tomcat-9.0-digest.script
--- a/tomcat-9.0-log4j.properties
+++ b/tomcat-9.0-log4j.properties
@ -0,0 +1,11 @@
+log4j.rootLogger=debug, R 
+log4j.appender.R=org.apache.log4j.RollingFileAppender 
+log4j.appender.R.File=${catalina.base}/logs/tomcat.log 
+log4j.appender.R.MaxFileSize=10MB 
+log4j.appender.R.MaxBackupIndex=10 
+log4j.appender.R.layout=org.apache.log4j.PatternLayout 
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n 
+log4j.logger.org.apache.catalina=DEBUG, R
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
+log4j.logger.org.apache.catalina.core=DEBUG, R
+log4j.logger.org.apache.catalina.session=DEBUG, R
--- a/SOURCES/tomcat-9.0-tomcat-users-webapp.patch
+++ b/SOURCES/tomcat-9.0-tomcat-users-webapp.patch
--- a/SOURCES/tomcat-9.0-tool-wrapper.script
+++ b/SOURCES/tomcat-9.0-tool-wrapper.script
--- a/SOURCES/tomcat-9.0.conf
+++ b/SOURCES/tomcat-9.0.conf
--- a/SOURCES/tomcat-9.0.service
+++ b/SOURCES/tomcat-9.0.service
--- a/SOURCES/tomcat-9.0.sysconfig
+++ b/SOURCES/tomcat-9.0.sysconfig
--- a/SOURCES/tomcat-9.0.wrapper
+++ b/SOURCES/tomcat-9.0.wrapper
--- a/SOURCES/tomcat-functions
+++ b/SOURCES/tomcat-functions
--- a/SOURCES/tomcat-named.service
+++ b/SOURCES/tomcat-named.service
--- a/SOURCES/tomcat-preamble
+++ b/SOURCES/tomcat-preamble
--- a/SOURCES/tomcat-server
+++ b/SOURCES/tomcat-server
				`@ -1 +0,0 @@`
				`d3342fad0113532635b6d2ec733e189abeadaf0d SOURCES/tomcat-9.0.50.redhat-00006-src.zip`
				`@ -0,0 +1 @@`
				`SHA512 (tomcat-9.0.50.redhat-00006-src.zip) = 15492c8102a4e21e413e92264e05939cd38e4832a84ad842459e4f3d0b0abb3a9e9eeb3b39fcaff3ebac9098eb882692f8fa3ea20f2471c65d90040ff277dfe9`