From ce50f8c0d6965bb0f36d8fd52e88c68e6cb55dc5e0d77e05dd9b6d23a0670f9d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Feb 2022 19:00:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=234 --- tomcat.changes | 5 +++++ tomcat.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index c06549f..d286aae 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 22 19:00:25 UTC 2022 - Fridrich Strba + +- Do not build against the log4j12 packages, use the new reload4j + ------------------------------------------------------------------- Fri Jan 28 14:01:40 UTC 2022 - Michele Bussolotto diff --git a/tomcat.spec b/tomcat.spec index be96942..d3fed2c 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -108,8 +108,8 @@ BuildRequires: jakarta-taglibs-standard >= 1.1 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit -BuildRequires: log4j12 BuildRequires: pkgconfig +BuildRequires: reload4j BuildRequires: sed BuildRequires: systemd-rpm-macros BuildRequires: unzip @@ -122,7 +122,7 @@ Requires: apache-commons-dbcp Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: java >= 1.8 -Requires: log4j12 +Requires: reload4j Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd @@ -445,7 +445,7 @@ pushd %{buildroot}%{libdir} rm -f commons-dbcp.jar ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar ln -s $(build-classpath commons-pool2) commons-pool2.jar - ln -s $(build-classpath log4j12/log4j-12) log4j.jar + ln -s $(build-classpath reload4j/reload4j) log4j.jar ln -s $(build-classpath ecj/ecj) jasper-jdt.jar # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)