From d7e800968e64c25ae50242e6fb4d530a2609d9a799620bd2384a7229e6e65081 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Feb 2022 19:04:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=54 --- apache-commons-logging.changes | 5 +++++ apache-commons-logging.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index e413880..555e461 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 22 19:04:25 UTC 2022 - Fridrich Strba + +- Do not build against the log4j12 packages, use the new reload4j + ------------------------------------------------------------------- Wed Jul 28 07:28:43 UTC 2021 - Fridrich Strba diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index fbed7c0..07c7f40 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -37,7 +37,7 @@ BuildRequires: ant BuildRequires: glassfish-servlet-api BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: log4j12-mini >= 1.2 +BuildRequires: reload4j Requires: java >= 1.8 Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version} @@ -79,7 +79,7 @@ export CLASSPATH=$(build-classpath \ ):target/classes:target/test-classes ant \ -Dmaven.mode.offline=true -lib %{_javadir} \ - -Dlog4j12.jar=%{_javadir}/log4j12/log4j-12.jar -Dservletapi.jar=%{_javadir}/glassfish-servlet-api.jar \ + -Dlog4j12.jar=$(find-jar reload4j/reload4j) -Dservletapi.jar=$(find-jar glassfish-servlet-api) \ dist %install