diff --git a/pki-servlet-container.spec b/pki-servlet-container.spec
index ef198f1..ef27220 100644
--- a/pki-servlet-container.spec
+++ b/pki-servlet-container.spec
@@ -94,9 +94,6 @@ BuildArch:     noarch
 BuildRequires: ant
 BuildRequires: ecj >= 1:4.6.3
 BuildRequires: findutils
-BuildRequires: apache-commons-collections
-BuildRequires: apache-commons-dbcp
-BuildRequires: apache-commons-pool
 BuildRequires: java-devel >= 1:1.8.0
 BuildRequires: jpackage-utils >= 0:1.7.0
 %if 0%{?fedora} >= 27 || 0%{?rhel} > 7
@@ -104,12 +101,7 @@ BuildRequires: jpackage-utils >= 0:1.7.0
 # See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro
 BuildRequires: javapackages-local
 %endif
-BuildRequires: junit
-BuildRequires: systemd-units
 
-Requires:      apache-commons-collections
-Requires:      apache-commons-dbcp
-Requires:      apache-commons-pool
 Requires:      java-headless >= 1:1.8.0
 Requires:      jpackage-utils
 Requires:      procps
@@ -178,15 +170,12 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 
 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
-   # we don't care about the tarballs and we're going to replace
-   # tomcat-dbcp.jar with apache-commons-{collections,dbcp,pool}-tomcat5.jar
-   # so just create a dummy file for later removal
+   # Create a dummy file for later removal
    touch HACK
 
    # who needs a build.properties file anyway
    %{ant} -Dbase.path="." \
       -Dbuild.compiler="modern" \
-      -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \
       -Dcommons-daemon.jar="HACK" \
       -Dcommons-daemon.native.src.tgz="HACK" \
       -Djdt.jar="$(build-classpath ecj)" \
@@ -303,8 +292,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
 popd
 
 pushd output/build
-    %{_bindir}/build-jar-repository lib apache-commons-collections \
-                                        apache-commons-dbcp apache-commons-pool ecj 2>&1
+    %{_bindir}/build-jar-repository lib ecj 2>&1
 popd
 
 pushd ${RPM_BUILD_ROOT}%{libdir}
@@ -312,9 +300,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 .
-    %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
-    %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
-    %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
 
     # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)