From fd75e507d2417caa15a01ca99c456e866dfa4350 Mon Sep 17 00:00:00 2001 From: Coty Sutherland Date: Thu, 21 Feb 2019 12:52:37 -0500 Subject: [PATCH] Removing unused dependency, apache-commons-collections, which was removed from upstream's build in r783696 --- tomcat.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index 13716c7..c7fa0fa 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -92,7 +92,6 @@ BuildArch: noarch BuildRequires: ant BuildRequires: ecj >= 1:4.6.1 BuildRequires: findutils -BuildRequires: apache-commons-collections BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-pool @@ -113,7 +112,6 @@ BuildRequires: wsdl4j BuildRequires: systemd Requires: apache-commons-daemon -Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool Requires: java-headless >= 1:1.8.0 @@ -186,7 +184,6 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: ecj >= 1:4.6.1 -Requires: apache-commons-collections Requires: apache-commons-dbcp Requires: apache-commons-pool Requires(preun): coreutils @@ -245,7 +242,6 @@ export OPT_JAR_LIST="xalan-j2-serializer" # who needs a build.properties file anyway %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ - -Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ -Djdt.jar="$(build-classpath ecj)" \ @@ -365,8 +361,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 apache-commons-dbcp apache-commons-pool ecj 2>&1 # need to use -p here with b-j-r otherwise the examples webapp fails to # load with a java.io.IOException %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ @@ -378,7 +373,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir} %{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar . %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-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