From 5e42dde6d9c9ffd4ae7d704479ab34ac1069324db955618eb0c915ff22b55326 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2019 11:33:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xbean?expand=0&rev=11 --- xbean.changes | 5 +++++ xbean.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xbean.changes b/xbean.changes index 4ac452b..63dd3ff 100644 --- a/xbean.changes +++ b/xbean.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 11:33:05 UTC 2019 - Fridrich Strba + +- Build against the new log4j12 compat package + ------------------------------------------------------------------- Thu Apr 4 11:35:11 UTC 2019 - Fridrich Strba diff --git a/xbean.spec b/xbean.spec index 44f8445..99d7aa8 100644 --- a/xbean.spec +++ b/xbean.spec @@ -32,7 +32,7 @@ BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools -BuildRequires: log4j +BuildRequires: log4j12 BuildRequires: objectweb-asm >= 5 BuildRequires: slf4j BuildRequires: unzip @@ -106,14 +106,14 @@ for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; pushd $i mkdir -p build/classes javac -d build/classes -encoding utf-8 -source 6 -target 6 \ - -cp $(build-classpath log4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \ + -cp $(build-classpath log4j12/log4j-12 commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons):../xbean-asm-util/xbean-asm-util.jar \ $(find src/main/java -name *.java) jar cf $i.jar -C build/classes . popd done mkdir -p build/apidoc javadoc -d build/apidoc -source 6 -encoding utf-8 \ - -classpath $(build-classpath log4j commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \ + -classpath $(build-classpath log4j12/log4j-12 commons-logging-api slf4j/api objectweb-asm/asm objectweb-asm/asm-commons) \ $(for i in xbean-asm-util xbean-classpath xbean-finder xbean-naming xbean-reflect; do find $i/src/main/java -name *.java; done | xargs) %install