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

Accepting request 1120324 from Java:packages

Browse Source 
fix build with java 21

OBS-URL: https://build.opensuse.org/request/show/1120324
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xbean?expand=0&rev=8
This commit is contained in:
Ana Guerrero 2023-10-25 16:05:28 +00:00 committed by Git OBS Bridge
commit 928d5693d8
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
xbean-build.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

5
xbean.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 25 14:55:09 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with source/target 8 to fix build with jdk 21
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 7 09:46:33 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Mar 7 09:46:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>

20
xbean.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xbean # spec file for package xbean
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,13 +29,11 @@ Patch2: 0002-Unbundle-ASM.patch
Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: objectweb-asm >= 9 BuildRequires: objectweb-asm >= 9
BuildRequires: slf4j BuildRequires: slf4j
BuildRequires: unzip BuildRequires: unzip
Requires: objectweb-asm >= 9
Requires: slf4j
BuildArch: noarch BuildArch: noarch
%description %description
@ -60,14 +58,6 @@ This package provides API documentation for xbean.
cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/ cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/
# Parent POM is not packaged
%pom_remove_parent
for i in xbean-asm-util xbean-finder xbean-reflect; do
%pom_remove_parent ${i}
%pom_xpath_inject pom:project "<groupId>org.apache.xbean</groupId><version>%{version}</version>" ${i}
done
%pom_disable_module xbean-classloader %pom_disable_module xbean-classloader
%pom_disable_module xbean-classpath %pom_disable_module xbean-classpath
%pom_disable_module xbean-bundleutils %pom_disable_module xbean-bundleutils
@ -93,8 +83,6 @@ find -name Log4jConverter.java -delete
%pom_remove_dep org.osgi:org.osgi.core xbean-finder %pom_remove_dep org.osgi:org.osgi.core xbean-finder
rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle* rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
%pom_change_dep -r -f ::::: :::::
%build %build
mkdir -p lib mkdir -p lib
build-jar-repository -s lib objectweb-asm slf4j build-jar-repository -s lib objectweb-asm slf4j
@ -110,7 +98,7 @@ done
# poms # poms
install -dm 755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 755 %{buildroot}%{_mavenpomdir}/%{name}
for i in xbean-asm-util xbean-finder xbean-reflect; do for i in xbean-asm-util xbean-finder xbean-reflect; do
install -m 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
done done