From 811b0ad9630e2d8429a29208b220bda8602a3c253a37ada05dad30c576fc7e0c Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:57:29 +0000
Subject: [PATCH 1/2] Accepting request 1114398 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114398
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xbean?expand=0&rev=26
---
 xbean.spec | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/xbean.spec b/xbean.spec
index 8e433e4..20785cb 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,7 +1,7 @@
 #
 # 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
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,12 +30,10 @@ Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.7
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  objectweb-asm >= 9
 BuildRequires:  slf4j
 BuildRequires:  unzip
-Requires:       objectweb-asm >= 9
-Requires:       slf4j
 BuildArch:      noarch
 
 %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/
 
-# 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-classpath
 %pom_disable_module xbean-bundleutils
@@ -93,8 +83,6 @@ find -name Log4jConverter.java -delete
 %pom_remove_dep org.osgi:org.osgi.core xbean-finder
 rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
 
-%pom_change_dep -r -f ::::: :::::
-
 %build
 mkdir -p lib
 build-jar-repository -s lib objectweb-asm slf4j
@@ -110,7 +98,7 @@ done
 # poms
 install -dm 755 %{buildroot}%{_mavenpomdir}/%{name}
 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
 done
 

From 926c31568a2db8f045f04490845ae9e08e7ced9c1a08645f321e6643521a6ad2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Oct 2023 14:55:26 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xbean?expand=0&rev=27

---
 xbean-build.tar.xz | 4 ++--
 xbean.changes      | 5 +++++
 xbean.spec         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xbean-build.tar.xz b/xbean-build.tar.xz
index 68a0952..8b25a61 100644
--- a/xbean-build.tar.xz
+++ b/xbean-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ab2b6f7661dc3d5763bb96acb2e67944ea11f28eea930c6e2713d9a99ef9d5c
-size 2332
+oid sha256:79125050845de38b636f40068fdd0ed47a2b5362e76eb3cc477d81f7ae772ec7
+size 2368
diff --git a/xbean.changes b/xbean.changes
index f4efe6d..d969c86 100644
--- a/xbean.changes
+++ b/xbean.changes
@@ -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>
 
diff --git a/xbean.spec b/xbean.spec
index 20785cb..9f0c472 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -29,7 +29,7 @@ Patch2:         0002-Unbundle-ASM.patch
 Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.7
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  objectweb-asm >= 9
 BuildRequires:  slf4j