pool/xbean
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 734273 from Java:packages

Browse Source 
Build against the new compatibility package log4j12

OBS-URL: https://build.opensuse.org/request/show/734273
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xbean?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2019-10-04 09:21:30 +00:00 committed by Git OBS Bridge
commit f6c1954b38
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xbean.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 1 11:33:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new log4j12 compat package
-------------------------------------------------------------------
Thu Apr 4 11:35:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>

6
xbean.spec
View File

@ -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