Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2016-10-13 11:29:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2016-09-23 11:31:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new/tomcat.changes 2016-10-13 11:29:50.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 29 12:26:30 UTC 2016 - [email protected] + +- Switch to commons-dbcp2 fate#321029 + +------------------------------------------------------------------- Old: ---- dbcp-tomcat-build.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.IyA97H/_old 2016-10-13 11:29:52.000000000 +0200 +++ /var/tmp/diff_new_pack.IyA97H/_new 2016-10-13 11:29:52.000000000 +0200 @@ -64,7 +64,6 @@ Source30: tomcat-preamble Source31: tomcat-server Source32: tomcat-named.service -Source40: dbcp-tomcat-build.xml Source1000: tomcat-rpmlintrc Source1001: http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc Source1002: %{name}.keyring @@ -82,6 +81,10 @@ Patch5: tomcat-8.0.36-jar-scanner-loop.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-daemon +BuildRequires: apache-commons-dbcp >= 2.0 +BuildRequires: apache-commons-pool2 BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils @@ -89,12 +92,6 @@ BuildRequires: geronimo-jaxrpc-1_1-api BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-daemon -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-dbcp-src -BuildRequires: jakarta-commons-pool -BuildRequires: jakarta-commons-pool-tomcat5 BuildRequires: jakarta-taglibs-standard >= 1.1 BuildRequires: java-devel >= 1.7.0 BuildRequires: javapackages-tools @@ -107,10 +104,10 @@ BuildRequires: wsdl4j BuildRequires: zip Requires: %{name}-lib = %{version}-%{release} -Requires: jakarta-commons-daemon -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-logging -Requires: jakarta-commons-pool +Requires: apache-commons-daemon +Requires: apache-commons-dbcp +Requires: apache-commons-logging +Requires: apache-commons-pool2 Requires: log4j Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd @@ -207,7 +204,6 @@ Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Requires(post): ecj >= 4.4 -Requires(post): jakarta-commons-pool-tomcat5 Requires(preun): coreutils Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 @@ -254,17 +250,6 @@ sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl %build -#bnc847505: build all commons-dbcp-tomcat jars before tomcat -# so we broke the build cycle between commons-dbcp and tomcat - -mkdir -p commons/dbcp -pushd commons/dbcp -cp %{SOURCE40} . -mkdir src -cp -r %{_usrsrc}/commons-dbcp/java src/ -export CLASSPATH=$(build-classpath commons-pool-tomcat5) -ant -f dbcp-tomcat-build.xml -popd ln -s $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar ln -s $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar @@ -274,7 +259,6 @@ export ANT_OPTS=-Xmx500M # we don't care about the tarballs and we're going to replace -# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar # so just create a dummy file for later removal touch HACK mkdir -p HACKDIR @@ -294,8 +278,8 @@ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ - -Dcommons-pool.home="HACKDIR" \ - -Dcommons-dbcp.home="HACKDIR" \ + -Dcommons-pool.home="$(build-classpath commons-pool2)" \ + -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \ -Dno.build.dbcp=true \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ @@ -388,9 +372,6 @@ cp -a *.jar %{buildroot}%{libdir} popd -# bnc#847505: add missing tomcat-dbcp.jar -cp -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar - # javadoc cp -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name} @@ -443,7 +424,7 @@ pushd output/build %{_bindir}/build-jar-repository lib commons-collections \ - commons-dbcp commons-pool ecj 2>&1 + commons-dbcp2 commons-pool2 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 \ @@ -457,9 +438,8 @@ ln -s ../%{name}-el-%{elspec}-api.jar . ln -s $(build-classpath commons-collections) commons-collections.jar rm -f commons-dbcp.jar - ln -s $(build-classpath commons-dbcp) commons-dbcp.jar - ln -s $(build-classpath commons-pool) commons-pool.jar - ln -s $(build-classpath commons-pool-tomcat5) commons-pool-tomcat5.jar + ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar + ln -s $(build-classpath commons-pool2) commons-pool2.jar ln -s $(build-classpath log4j) log4j.jar ln -s $(build-classpath ecj) jasper-jdt.jar
