Accepting request 957032 from Java:packages

Build against reload4j

OBS-URL: https://build.opensuse.org/request/show/957032
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/adaptx?expand=0&rev=26

adaptx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 22 18:51:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not build against the log4j12 packages, use the new reload4j
+
 -------------------------------------------------------------------
 Tue Oct  1 10:06:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 

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