diff --git a/.gitignore b/.gitignore
index 191ee83..5b097a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcat-9.0.30.redhat-4-src.zip
+SOURCES/tomcat-9.0.50.redhat-00006-src.zip
diff --git a/.pki-servlet-engine.metadata b/.pki-servlet-engine.metadata
index b091fff..0d66dba 100644
--- a/.pki-servlet-engine.metadata
+++ b/.pki-servlet-engine.metadata
@@ -1 +1 @@
-154cbcee2ff93a9a8efab28dd256f9edac95efe2 SOURCES/tomcat-9.0.30.redhat-4-src.zip
+d3342fad0113532635b6d2ec733e189abeadaf0d SOURCES/tomcat-9.0.50.redhat-00006-src.zip
diff --git a/SOURCES/removeUnusedDependencies.patch b/SOURCES/removeUnusedDependencies.patch
index 2485940..1aaa933 100644
--- a/SOURCES/removeUnusedDependencies.patch
+++ b/SOURCES/removeUnusedDependencies.patch
@@ -1,64 +1,26 @@
-diff -up ./build.properties.default.orig ./build.properties.default
---- ./build.properties.default.orig	2020-04-23 09:43:55.567688581 -0400
-+++ ./build.properties.default	2020-04-23 09:57:55.724988090 -0400
-@@ -274,35 +274,3 @@ findbugs.checksum.value=8c54502a8e1b78ea
- findbugs.home=${base.path}/spotbugs-${findbugs.version}
- findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
- findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
--
--# ----- SAAJ API, used by Code Signing for releases -----
--# ----- No longer part of JRE from Java 11 onwards  -----
--# ----- CDDL Licensed                               -----
--saaj-api.version=1.3.5
--saaj-api.checksum.enabled=true
--saaj-api.checksum.algorithm=MD5|SHA-1
--saaj-api.checksum.value=caae8b4bf2c551155815331e9e96256f|1c399a7fea4d0262a6a39750e419c24f0c769586
--saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
--saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
--saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
--
--# ----- bnd & bndlib, version 4.0.0 or later  -----
--# ----- provides OSGI metadata for JARs       -----
--bnd.version=4.2.0
--
--# checksums for biz.aQute.bnd-4.2.0.jar, biz.aQute.bndlib-4.2.0.jar
--bnd.checksum.enabled=true
--bnd.checksum.algorithm=MD5|SHA-1
--bnd.checksum.value=ca26a671ea67bf75d83b1588bdd68923|d4bc96b2619f95e596bbf3f725f3b077e96c5d43
--
--bndlib.checksum.enabled=true
--bndlib.checksum.algorithm=MD5|SHA-1
--bndlib.checksum.value=7519e890783ade99bb74608d0efbf8c4|c4fa30ac11cc0bf27b1f706ac8ebae8cec358e77
--
--bnd.home=${base.path}/bnd-${bnd.version}
--bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
--bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
--
--bndlib.home=${base.path}/bndlib-${bnd.version}
--bndlib.jar=${bndlib.home}/biz.aQute.bndlib-${bnd.version}.jar
--bndlib.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bndlib/${bnd.version}/biz.aQute.bndlib-${bnd.version}.jar
-diff -up ./build.xml.orig ./build.xml
---- ./build.xml.orig	2020-04-23 09:43:50.041699701 -0400
-+++ ./build.xml	2020-04-23 09:58:18.835941004 -0400
-@@ -69,7 +69,6 @@
+--- 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="${tomcat.output}/bnd"/>
+-  <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"/>
-@@ -219,9 +218,6 @@
+@@ -239,11 +238,6 @@
+ 
    <!-- Classpaths -->
    <path id="compile.classpath">
-     <pathelement location="${jdt.jar}"/>
--    <pathelement location="${saaj-api.jar}"/>
+-    <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>
-@@ -272,7 +268,6 @@
+@@ -298,7 +292,6 @@
      <include name="**/javax.websocket.ContainerProvider"/>
      <include name="**/javax.websocket.server.ServerEndpointConfig$Configurator"/>
      <include name="**/.gitignore"/>
@@ -66,362 +28,276 @@ diff -up ./build.xml.orig ./build.xml
      <include name="**/*.classpath"/>
      <include name="**/*.css"/>
      <include name="**/*.dtd"/>
-@@ -425,6 +420,7 @@
+@@ -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.catalina-tribes">
-@@ -556,18 +552,6 @@
-       </srcfiles>
-     </uptodate>
- 
--    <!-- Property that determines if OSGI bnd files need updating -->
--    <uptodate property="bnd.uptodate"
--        targetfile="${tomcat.bnd}/annotations-api.bnd" >
--      <srcfiles file="${user.home}/build.properties" />
--      <srcfiles file="${basedir}/build.properties" />
--      <srcfiles file="${basedir}/build.properties.default" />
--      <srcfiles file="${basedir}/build.xml" />
--      <srcfiles dir="${tomcat.home}/res/bnd" >
--        <include name="*.bnd" />
--      </srcfiles>
--    </uptodate>
--
+   <patternset id="files.tomcat-embed-programmatic">
+@@ -964,7 +958,7 @@
+     </copy>
    </target>
  
-   <target name="validate" if="${execute.validate}"
-@@ -712,6 +696,7 @@
+-  <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="ISO-8859-1">
-@@ -755,25 +740,12 @@
- 
-   </target>
- 
--  <target name="build-bnd" unless="bnd.uptodate"
--          depends="setup-bnd,build-prepare">
--
--    <mkdir dir="${tomcat.bnd}" />
--    <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes"
--          encoding="ISO-8859-1">
--      <filterset refid="version.filters"/>
--      <fileset dir="${tomcat.home}/res/bnd" />
--    </copy>
--
--  </target>
--
--  <target name="package" depends="compile,build-manifests,build-bnd" >
-+  <target name="package" depends="compile,build-manifests" >
-     <!-- Common Annotations 1.3 JAR File -->
-     <jarIt jarfile="${annotations-api.jar}"
+     <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"
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest"
 -      addOSGi="true" />
-+      manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
++      />
  
-     <!-- Servlet 4.0 Implementation JAR File -->
+     <!-- Servlet Implementation JAR File -->
      <jarIt jarfile="${servlet-api.jar}"
-@@ -781,43 +753,37 @@
-       filesId="files.servlet-api"
+@@ -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"
+       license="${tomcat.manifests}/servlet-api.jar.license"
 -      addOSGi="true" />
-+      license="${tomcat.manifests}/servlet-api.jar.license" />
++      />
  
-     <!-- JSP 2.3 Implementation JAR File -->
-     <jarIt jarfile="${jsp-api.jar}"
+     <!-- EL Implementation JAR File -->
+     <jarIt jarfile="${el-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
--      manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
 -      addOSGi="true" />
-+      manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++      />
  
-     <!-- EL 3.0 Implementation JAR File -->
-     <jarIt jarfile="${el-api.jar}"
+     <!-- JSP Implementation JAR File -->
+     <jarIt jarfile="${jsp-api.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.el-api"
--      manifest="${tomcat.manifests}/el-api.jar.manifest"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
 -      addOSGi="true" />
-+      manifest="${tomcat.manifests}/el-api.jar.manifest" />
++      />
  
-     <!-- WebSocket 1.1 API JAR File -->
+     <!-- WebSocket API JAR File -->
      <jarIt jarfile="${websocket-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.websocket-api"
--      manifest="${tomcat.manifests}/websocket-api.jar.manifest"
+       manifest="${tomcat.manifests}/websocket-api.jar.manifest"
 -      addOSGi="true" />
-+      manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
++      />
  
-     <!-- JASPIC 1.1 API JAR File -->
+     <!-- JASPIC API JAR File -->
      <jarIt jarfile="${jaspic-api.jar}"
        filesDir="${tomcat.classes}"
        filesId="files.jaspic-api"
--      manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
+       manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
 -      addOSGi="true" />
-+      manifest="${tomcat.manifests}/jaspic-api.jar.manifest" />
++      />
  
-     <!-- WebSocket 1.1 implementation JAR File -->
-     <jarIt jarfile="${tomcat-websocket.jar}"
+     <!-- Tomcat-juli JAR File -->
+     <jarIt jarfile="${tomcat-juli.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.tomcat-websocket"
--      meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
+       filesId="files.tomcat-juli"
 -      addOSGi="true" />
-+      meta-inf="${tomcat.manifests}/tomcat-websocket.jar" />
++      />
  
      <!-- Bootstrap JAR File -->
      <jarIt jarfile="${bootstrap.jar}"
-@@ -828,32 +794,27 @@
-     <!-- Tomcat-juli JAR File -->
-     <jarIt jarfile="${tomcat-juli.jar}"
+@@ -1087,61 +1082,61 @@
+     <jarIt jarfile="${tomcat-util.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-juli"
+       filesId="files.tomcat-util"
 -      addOSGi="true" />
-+      filesId="files.tomcat-juli" />
++      />
  
-     <!-- Catalina Main JAR File -->
-     <jarIt jarfile="${catalina.jar}"
+     <!-- Tomcat API JAR File -->
+     <jarIt jarfile="${tomcat-api.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.catalina"
+       filesId="files.tomcat-api"
 -      addOSGi="true" />
-+      filesId="files.catalina" />
++      />
  
-     <!-- Catalina GroupCom/Tribes JAR File -->
-     <jarIt jarfile="${catalina-tribes.jar}"
+     <!-- Tomcat Util Scan JAR File -->
+     <jarIt jarfile="${tomcat-util-scan.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.catalina-tribes"
+       filesId="files.tomcat-util-scan"
 -      addOSGi="true" />
-+      filesId="files.catalina-tribes" />
++      />
  
-     <!-- Server-Side Includes (SSI) -->
-     <jarIt jarfile="${catalina-ssi.jar}"
+     <jarIt jarfile="${tomcat-jni.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.catalina-ssi"
+       filesId="files.tomcat-jni"
 -      addOSGi="true" />
-+      filesId="files.catalina-ssi" />
++      />
  
-     <!-- Catalina Cluster/HA JAR File -->
-     <jarIt jarfile="${catalina-ha.jar}"
+     <!-- Protocol handlers - Coyote -->
+     <jarIt jarfile="${tomcat-coyote.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.catalina-ha"
+       filesId="files.tomcat-coyote"
 -      addOSGi="true" />
-+      filesId="files.catalina-ha" />
++      />
  
-     <!-- Catalina Ant Tasks JAR File -->
-     <jarIt jarfile="${catalina-ant.jar}"
-@@ -863,56 +824,47 @@
-     <!-- Catalina Storeconfig JAR File -->
-     <jarIt jarfile="${catalina-storeconfig.jar}"
+     <!-- WebSocket implementation JAR File -->
+     <jarIt jarfile="${tomcat-websocket.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.catalina-storeconfig"
+       filesId="files.tomcat-websocket"
+       meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
 -      addOSGi="true" />
-+      filesId="files.catalina-storeconfig" />
++      />
  
-     <!-- Tomcat API JAR File -->
-     <jarIt jarfile="${tomcat-api.jar}"
+     <!-- Catalina GroupCom/Tribes JAR File -->
+     <jarIt jarfile="${catalina-tribes.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-api"
+       filesId="files.catalina-tribes"
 -      addOSGi="true" />
-+      filesId="files.tomcat-api" />
++      />
  
-     <!-- Tomcat Util JAR File -->
-     <jarIt jarfile="${tomcat-util.jar}"
+     <!-- Catalina Main JAR File -->
+     <jarIt jarfile="${catalina.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-util"
+       filesId="files.catalina"
 -      addOSGi="true" />
-+      filesId="files.tomcat-util" />
++      />
  
-     <!-- Tomcat Util Scan JAR File -->
-     <jarIt jarfile="${tomcat-util-scan.jar}"
+     <!-- Catalina Cluster/HA JAR File -->
+     <jarIt jarfile="${catalina-ha.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-util-scan"
+       filesId="files.catalina-ha"
 -      addOSGi="true" />
-+      filesId="files.tomcat-util-scan" />
++      />
  
-     <!-- Protocol handlers - Coyote -->
-     <jarIt jarfile="${tomcat-coyote.jar}"
+     <!-- Server-Side Includes (SSI) -->
+     <jarIt jarfile="${catalina-ssi.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-coyote"
+       filesId="files.catalina-ssi"
 -      addOSGi="true" />
-+      filesId="files.tomcat-coyote" />
++      />
  
-     <jarIt jarfile="${tomcat-jni.jar}"
+     <!-- Catalina Ant Tasks JAR File -->
+     <jarIt jarfile="${catalina-ant.jar}"
+@@ -1152,27 +1147,27 @@
+     <jarIt jarfile="${catalina-storeconfig.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-jni"
+       filesId="files.catalina-storeconfig"
 -      addOSGi="true" />
-+      filesId="files.tomcat-jni" />
++      />
  
-     <!-- Jasper Implementation JAR File -->
-     <jarIt jarfile="${jasper.jar}"
+     <!-- Jasper EL Implementation JAR File -->
+     <jarIt jarfile="${jasper-el.jar}"
        filesDir="${tomcat.classes}"
-       filesId="files.jasper"
--      meta-inf="${tomcat.manifests}/jasper.jar"
+       filesId="files.jasper-el"
+       meta-inf="${tomcat.manifests}/jasper-el.jar"
 -      addOSGi="true" />
-+      meta-inf="${tomcat.manifests}/jasper.jar" />
++      />
  
-     <!-- Jasper EL Implementation JAR File -->
-     <jarIt jarfile="${jasper-el.jar}"
+     <!-- Jasper Implementation JAR File -->
+     <jarIt jarfile="${jasper.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.jasper-el"
+       filesId="files.jasper"
+       meta-inf="${tomcat.manifests}/jasper.jar"
 -      addOSGi="true" />
-+      filesId="files.jasper-el" />
++      />
  
      <!-- Re-packaged Apache Commons DBCP 2-->
      <jarIt jarfile="${tomcat-dbcp.jar}"
        filesDir="${tomcat.classes}"
--      filesId="files.tomcat-dbcp"
+       filesId="files.tomcat-dbcp"
 -      addOSGi="true" />
-+      filesId="files.tomcat-dbcp" />
++      />
  
      <!-- i18n JARs -->
      <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
-@@ -1369,7 +1321,7 @@
+@@ -1616,7 +1611,7 @@
      </txt2html>
    </target>
    <target name="embed-jars" description="Create experimental embedded jars"
--    depends="build-manifests,build-bnd,compile" >
-+    depends="build-manifests,compile" >
+-    depends="build-manifests,setup-bnd,compile,package" >
++    depends="build-manifests,compile,package" >
  
      <mkdir dir="${tomcat.embed}" />
  
-@@ -1387,22 +1339,18 @@
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-core"
-            notice="${tomcat.manifests}/servlet-api.jar.notice"
--           license="${tomcat.manifests}/servlet-api.jar.license"
--           addOSGi="true" />
-+           license="${tomcat.manifests}/servlet-api.jar.license" />
-     <jarIt jarfile="${tomcat-embed-jasper.jar}"
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-jasper"
--           meta-inf="${tomcat.manifests}/jasper.jar"
--           addOSGi="true" />
-+           meta-inf="${tomcat.manifests}/jasper.jar" />
-     <jarIt jarfile="${tomcat-embed-el.jar}"
-            filesDir="${tomcat.classes}"
--           filesId="files.tomcat-embed-el"
--           addOSGi="true" />
-+           filesId="files.tomcat-embed-el" />
-     <jarIt jarfile="${tomcat-embed-websocket.jar}"
-            filesDir="${tomcat.classes}"
-            filesId="files.tomcat-embed-websocket"
--           meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
--           addOSGi="true" />
-+           meta-inf="${tomcat.manifests}/tomcat-websocket.jar" />
+@@ -3137,7 +3132,7 @@ skip.installer property in build.propert
  
-   </target>
+   <target name="download-compile"
+           description="Download components necessary to compile"
+-          depends="setup-bnd">
++          >
  
-@@ -2749,34 +2697,6 @@ skip.installer property in build.propert
-       <param name="checksum.value" value="${jdt.checksum.value}"/>
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -3712,15 +3707,6 @@ Read the Building page on the Apache Tom
      </antcall>
- 
--    <!-- Download SAAJ API -->
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${saaj-api.loc}"/>
--      <param name="destfile" value="${saaj-api.jar}"/>
--      <param name="destdir" value="${saaj-api.home}"/>
--      <param name="checksum.enabled" value="${saaj-api.checksum.enabled}"/>
--      <param name="checksum.algorithm" value="${saaj-api.checksum.algorithm}"/>
--      <param name="checksum.value" value="${saaj-api.checksum.value}"/>
--    </antcall>
--
--
--    <!-- Download WS API -->
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
--      <param name="destfile" value="${jaxrpc-lib.jar}"/>
--      <param name="destdir" value="${jaxrpc-lib.home}"/>
--      <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/>
--      <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
--      <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
--    </antcall>
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
--      <param name="destfile" value="${wsdl4j-lib.jar}"/>
--      <param name="destdir" value="${wsdl4j-lib.home}"/>
--      <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/>
--      <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
--      <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
--    </antcall>
- 
    </target>
  
-@@ -3261,38 +3181,6 @@ Read the Building page on the Apache Tom
- 
-   <!-- ======================= Macros, Taskdefs etc ======================== -->
- 
--  <target name="download-bnd" >
--    <!-- Download bnd -->
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${bnd.loc}"/>
--      <param name="destfile" value="${bnd.jar}"/>
--      <param name="destdir" value="${bnd.home}"/>
--      <param name="checksum.enabled" value="${bnd.checksum.enabled}"/>
--      <param name="checksum.algorithm" value="${bnd.checksum.algorithm}"/>
--      <param name="checksum.value" value="${bnd.checksum.value}"/>
--    </antcall>
--
--    <!-- Download bndlib -->
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${bndlib.loc}"/>
--      <param name="destfile" value="${bndlib.jar}"/>
--      <param name="destdir" value="${bndlib.home}"/>
--      <param name="checksum.enabled" value="${bndlib.checksum.enabled}"/>
--      <param name="checksum.algorithm" value="${bndlib.checksum.algorithm}"/>
--      <param name="checksum.value" value="${bndlib.checksum.value}"/>
--    </antcall>
--  </target>
--
--  <target name="setup-bnd" depends="download-bnd">
+-  <target name="setup-bnd" >
 -    <!-- Add bnd tasks to project -->
--    <path id="bndlib.classpath">
+-    <path id="bnd.classpath">
 -      <fileset file="${bnd.jar}" />
--      <fileset file="${bndlib.jar}" />
 -    </path>
 -
--    <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" />
+-    <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"/>
-@@ -3308,8 +3196,6 @@ Read the Building page on the Apache Tom
-                default="${tomcat.manifests}/default.license" />
-     <attribute name="meta-inf" description="additional contents for META-INF"
-                default="${tomcat.manifests}/default" />
--    <attribute name="addOSGi" description="generate OSGi metadata"
--               default="false" />
-     <sequential>
-       <jar jarfile="@{jarfile}" manifest="@{manifest}">
-         <fileset dir="@{filesDir}">
-@@ -3323,22 +3209,9 @@ Read the Building page on the Apache Tom
-         <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" />
-         <zipfileset file="@{license}" fullpath="META-INF/LICENSE" />
-       </jar>
--      <antcall target="add-osgi" >
--        <param name="jarfile" value="@{jarfile}" />
--        <param name="addOSGi" value="@{addOSGi}" />
--      </antcall>
-     </sequential>
-   </macrodef>
- 
--  <target name="add-osgi" if="${addOSGi}" >
--    <echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
--    <bndwrap output="${jarfile}.tmp" definitions="${tomcat.bnd}" >
--      <fileset file="${jarfile}"  />
--    </bndwrap>
--    <delete file="${jarfile}" />
--    <move file="${jarfile}.tmp" tofile="${jarfile}" />
--  </target>
+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;
 -
-   <!-- Macro, used to create checksum and signature files  -->
-   <!-- Requires 'file' as a parameter. -->
-   <macrodef name="hashAndSign">
+ /**
+  * 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
diff --git a/SOURCES/tomcat-9.0-catalina-policy.patch b/SOURCES/tomcat-9.0-catalina-policy.patch
index c8c5c08..0a460dc 100644
--- a/SOURCES/tomcat-9.0-catalina-policy.patch
+++ b/SOURCES/tomcat-9.0-catalina-policy.patch
@@ -1,8 +1,8 @@
---- conf/catalina.policy.orig	2018-06-21 13:30:04.074492012 -0400
-+++ conf/catalina.policy	2018-06-21 13:30:02.111479809 -0400
-@@ -50,6 +50,30 @@ grant codeBase "file:${java.home}/lib/ex
-         permission java.security.AllPermission;
- };
+--- 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
+ //        permission java.security.AllPermission;
+ //};
  
 +// ========== RHEL SPECIFIC CODE PERMISSIONS =======================================
 +
diff --git a/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch b/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch
deleted file mode 100644
index 4c477b4..0000000
--- a/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- java/org/apache/jasper/compiler/JDTCompiler.java.orig	2020-04-21 13:14:09.678677327 -0400
-+++ java/org/apache/jasper/compiler/JDTCompiler.java	2020-04-21 13:14:53.044535302 -0400
-@@ -313,25 +313,6 @@ public class JDTCompiler extends org.apa
-             } else if(opt.equals("1.8")) {
-                 settings.put(CompilerOptions.OPTION_Source,
-                              CompilerOptions.VERSION_1_8);
--            // Version format changed from Java 9 onwards.
--            // Support old format that was used in EA implementation as well
--            } else if(opt.equals("9") || opt.equals("1.9")) {
--                settings.put(CompilerOptions.OPTION_Source,
--                             CompilerOptions.VERSION_9);
--            } else if(opt.equals("10")) {
--                settings.put(CompilerOptions.OPTION_Source,
--                             CompilerOptions.VERSION_10);
--            } else if(opt.equals("11")) {
--                settings.put(CompilerOptions.OPTION_Source,
--                             CompilerOptions.VERSION_11);
--            } else if(opt.equals("12")) {
--                settings.put(CompilerOptions.OPTION_Source,
--                             CompilerOptions.VERSION_12);
--            } else if(opt.equals("13")) {
--                // Constant not available in latest ECJ version shipped with
--                // Tomcat. May be supported in a snapshot build.
--                // This is checked against the actual version below.
--                settings.put(CompilerOptions.OPTION_Source, "13");
-             } else {
-                 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
-                 settings.put(CompilerOptions.OPTION_Source,
-@@ -378,34 +359,6 @@ public class JDTCompiler extends org.apa
-                              CompilerOptions.VERSION_1_8);
-                 settings.put(CompilerOptions.OPTION_Compliance,
-                         CompilerOptions.VERSION_1_8);
--            // Version format changed from Java 9 onwards.
--            // Support old format that was used in EA implementation as well
--            } else if(opt.equals("9") || opt.equals("1.9")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform,
--                             CompilerOptions.VERSION_9);
--                settings.put(CompilerOptions.OPTION_Compliance,
--                        CompilerOptions.VERSION_9);
--            } else if(opt.equals("10")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform,
--                        CompilerOptions.VERSION_10);
--                settings.put(CompilerOptions.OPTION_Compliance,
--                        CompilerOptions.VERSION_10);
--            } else if(opt.equals("11")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform,
--                        CompilerOptions.VERSION_11);
--                settings.put(CompilerOptions.OPTION_Compliance,
--                        CompilerOptions.VERSION_11);
--            } else if(opt.equals("12")) {
--                settings.put(CompilerOptions.OPTION_TargetPlatform,
--                        CompilerOptions.VERSION_12);
--                settings.put(CompilerOptions.OPTION_Compliance,
--                        CompilerOptions.VERSION_12);
--            } else if(opt.equals("13")) {
--                // Constant not available in latest ECJ version shipped with
--                // Tomcat. May be supported in a snapshot build.
--                // This is checked against the actual version below.
--                settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
--                settings.put(CompilerOptions.OPTION_Compliance, "13");
-             } else {
-                 log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
-                 settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/SPECS/pki-servlet-engine.spec b/SPECS/pki-servlet-engine.spec
index 0d57920..51a0b62 100644
--- a/SPECS/pki-servlet-engine.spec
+++ b/SPECS/pki-servlet-engine.spec
@@ -30,8 +30,8 @@
 
 %global major_version 9
 %global minor_version 0
-%global micro_version 30
-%global redhat_version 4
+%global micro_version 50
+%global redhat_version 00006
 %global packdname apache-tomcat-%{version}.redhat-%{redhat_version}-src
 
 # Specification versions
@@ -58,7 +58,7 @@
 Name:          pki-servlet-engine
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       3%{?dist}
+Release:       1%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 Group:         System Environment/Daemons
 License:       ASL 2.0
@@ -79,9 +79,8 @@ 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-9.0.30-CompilerOptionsRemoval.patch
-Patch3:        tomcat-%{major_version}.%{minor_version}-catalina-policy.patch
-Patch4:        removeUnusedDependencies.patch
+Patch2:        tomcat-%{major_version}.%{minor_version}-catalina-policy.patch
+Patch3:        removeUnusedDependencies.patch
 
 BuildArch:     noarch
 
@@ -142,7 +141,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
-%patch4 -p0
 
 # Since we don't support ECJ in RHEL anymore, remove the class that requires it
 %{__rm} -f java/org/apache/jasper/compiler/JDTCompiler.java
@@ -459,6 +457,10 @@ fi
 %{_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
+
 * Fri Jun 11 2021 Coty Sutherland <csutherl@redhat.com> - 1:9.0.30-3
 - Reverts: rhbz#1969366 as it causes other issues