From e9e316484ee9f8c748dee952f955194b1cc5ea43 Mon Sep 17 00:00:00 2001 From: fstrba <> Date: Feb 23 2022 18:44:16 +0000 Subject: Update adaptx to version 0.9.13 / rev 26 via SR 957032 https://build.opensuse.org/request/show/957032 by user fstrba + dimstar_suse Build against reload4j --- diff --git a/.files b/.files index cefa87a..d278986 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 665c68a..9e5ae01 100644 --- a/.rev +++ b/.rev @@ -179,4 +179,12 @@ Automatic submission by obs-autosubmit 736056 + + a4cc4f832923a5d5cdb772f68c4036b4 + 0.9.13 + + dimstar_suse + Build against reload4j + 957032 + diff --git a/adaptx.changes b/adaptx.changes index b043856..a83b42d 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Feb 22 18:51:17 UTC 2022 - Fridrich Strba + +- Do not build against the log4j12 packages, use the new reload4j + +------------------------------------------------------------------- Tue Oct 1 10:06:34 UTC 2019 - Fridrich Strba - Build against the new compatibility log4j12-mini package diff --git a/adaptx.spec b/adaptx.spec index 36d9e4f..a267836 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -1,7 +1,7 @@ # # spec file for package adaptx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,10 +30,10 @@ Patch1: %{name}-%{version}-icedtea-build.patch BuildRequires: ant >= 1.6 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools -BuildRequires: log4j12 +BuildRequires: reload4j BuildRequires: xerces-j2 BuildRequires: xml-apis -Requires: log4j12 +Requires: reload4j Requires: xerces-j2 Requires: xml-apis BuildArch: noarch @@ -68,7 +68,7 @@ done %build perl -p -i -e 's|classic|modern|' src/build.xml -export CLASSPATH=$(build-classpath xml-apis log4j12/log4j-12 xerces-j2) +export CLASSPATH=$(build-classpath xml-apis reload4j xerces-j2) ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml jar javadoc CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 -buildfile src/build.xml doc