diff --git a/.gitignore b/.gitignore
index 720a26f..191ee83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcat-9.0.7.redhat-16-src.zip
+SOURCES/tomcat-9.0.30.redhat-4-src.zip
diff --git a/.pki-servlet-engine.metadata b/.pki-servlet-engine.metadata
index 7591c59..b091fff 100644
--- a/.pki-servlet-engine.metadata
+++ b/.pki-servlet-engine.metadata
@@ -1 +1 @@
-ce77ee6a1812de5a7c4f1475a1d1f473f0a04779 SOURCES/tomcat-9.0.7.redhat-16-src.zip
+154cbcee2ff93a9a8efab28dd256f9edac95efe2 SOURCES/tomcat-9.0.30.redhat-4-src.zip
diff --git a/SOURCES/removeUnusedDependencies.patch b/SOURCES/removeUnusedDependencies.patch
new file mode 100644
index 0000000..2485940
--- /dev/null
+++ b/SOURCES/removeUnusedDependencies.patch
@@ -0,0 +1,427 @@
+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 @@
+
+
+
+-
+
+
+
+@@ -219,9 +218,6 @@
+
+
+
+-
+-
+-
+
+
+
+@@ -272,7 +268,6 @@
+
+
+
+-
+
+
+
+@@ -425,6 +420,7 @@
+
+
+
++
+
+
+
+@@ -556,18 +552,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+
+
++
+
+
+
+@@ -755,25 +740,12 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++
+
+
++ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+
+
++ license="${tomcat.manifests}/servlet-api.jar.license" />
+
+
+
++ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+
+
+
++ manifest="${tomcat.manifests}/el-api.jar.manifest" />
+
+
+
++ manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
+
+
+
++ manifest="${tomcat.manifests}/jaspic-api.jar.manifest" />
+
+
+
++ meta-inf="${tomcat.manifests}/tomcat-websocket.jar" />
+
+
+
+
++ filesId="files.tomcat-juli" />
+
+
+
++ filesId="files.catalina" />
+
+
+
++ filesId="files.catalina-tribes" />
+
+
+
++ filesId="files.catalina-ssi" />
+
+
+
++ filesId="files.catalina-ha" />
+
+
+
+
++ filesId="files.catalina-storeconfig" />
+
+
+
++ filesId="files.tomcat-api" />
+
+
+
++ filesId="files.tomcat-util" />
+
+
+
++ filesId="files.tomcat-util-scan" />
+
+
+
++ filesId="files.tomcat-coyote" />
+
+
++ filesId="files.tomcat-jni" />
+
+
+
++ meta-inf="${tomcat.manifests}/jasper.jar" />
+
+
+
++ filesId="files.jasper-el" />
+
+
+
++ filesId="files.tomcat-dbcp" />
+
+
+
+
+
++ depends="build-manifests,compile" >
+
+
+
+@@ -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" />
+
++ meta-inf="${tomcat.manifests}/jasper.jar" />
+
++ filesId="files.tomcat-embed-el" />
+
++ meta-inf="${tomcat.manifests}/tomcat-websocket.jar" />
+
+
+
+@@ -2749,34 +2697,6 @@ skip.installer property in build.propert
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -3261,38 +3181,6 @@ Read the Building page on the Apache Tom
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+@@ -3308,8 +3196,6 @@ Read the Building page on the Apache Tom
+ default="${tomcat.manifests}/default.license" />
+
+-
+
+
+
+@@ -3323,22 +3209,9 @@ Read the Building page on the Apache Tom
+
+
+
+-
+-
+-
+-
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
diff --git a/SOURCES/tomcat-8.0.36-CompilerOptionsV9.patch b/SOURCES/tomcat-8.0.36-CompilerOptionsV9.patch
deleted file mode 100644
index 0b44236..0000000
--- a/SOURCES/tomcat-8.0.36-CompilerOptionsV9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-07-01 14:39:19.728255958 -0400
-+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-07-01 14:39:37.191311760 -0400
-@@ -312,9 +312,6 @@
- } else if(opt.equals("1.8")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
-- } else if(opt.equals("1.9")) {
-- settings.put(CompilerOptions.OPTION_Source,
-- CompilerOptions.VERSION_1_9);
- } else {
- log.warn("Unknown source VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_Source,
-@@ -361,11 +358,6 @@
- CompilerOptions.VERSION_1_8);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_8);
-- } else if(opt.equals("1.9")) {
-- settings.put(CompilerOptions.OPTION_TargetPlatform,
-- CompilerOptions.VERSION_1_9);
-- settings.put(CompilerOptions.OPTION_Compliance,
-- CompilerOptions.VERSION_1_9);
- } else {
- log.warn("Unknown target VM " + opt + " ignored.");
- settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch b/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch
new file mode 100644
index 0000000..4c477b4
--- /dev/null
+++ b/SOURCES/tomcat-9.0.30-CompilerOptionsRemoval.patch
@@ -0,0 +1,63 @@
+--- 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 a7134ea..fc97047 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 7
-%global redhat_version 16
+%global micro_version 30
+%global redhat_version 4
%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: 16%{?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,8 +79,9 @@ 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-8.0.36-CompilerOptionsV9.patch
+Patch2: tomcat-9.0.30-CompilerOptionsRemoval.patch
Patch3: tomcat-%{major_version}.%{minor_version}-catalina-policy.patch
+Patch4: removeUnusedDependencies.patch
BuildArch: noarch
@@ -107,7 +108,7 @@ 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.7.redhat-%{redhat_version}
+Provides: bundled(tomcat) = 9.0.30.redhat-%{redhat_version}
Obsoletes: pki-servlet-container
@@ -141,6 +142,7 @@ 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
@@ -164,7 +166,7 @@ touch HACK
deploy dist-prepare dist-source
# remove some jars that we don't need
-%{__rm} output/build/bin/commons-daemon.jar
+#%%{__rm} output/build/bin/commons-daemon.jar
%install
# build initial path structure
@@ -457,6 +459,11 @@ fi
%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
%changelog
+* Thu Apr 23 2020 Coty Sutherland - 1:9.0.30-1
+- Resolves: rhbz#1721684 Rebase pki-servlet-engine to 9.0.30
+- Update to JWS 5.3.0 distribution
+- Remove new dependencies that PKI doesn't need (and are not provided by RHEL 8)
+
* Fri May 31 2019 Endi S. Dewata - 1:9.0.7-16
- Obsoleted pki-servlet-container