Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,3 +1,24 @@
-xbean-3.7.tar.xz
+/results_*
+/*.src.rpm
+
+/xbean-3.7.tar.xz
 /xbean-3.8.tar.xz
 /xbean-3.11.1.tar.xz
+/xbean-3.13-source-release.zip
+/xbean-3.16-source-release.zip
+/xbean-3.17-source-release.zip
+/xbean-4.1-source-release.zip
+/xbean-4.2-source-release.zip
+/xbean-4.3-source-release.zip
+/xbean-4.4-source-release.zip
+/xbean-4.5-source-release.zip
+/xbean-4.6-source-release.zip
+/xbean-4.8-source-release.zip
+/xbean-4.9-source-release.zip
+/xbean-4.14-source-release.zip
+/xbean-4.15-source-release.zip
+/xbean-4.17-source-release.zip
+/xbean-4.18-source-release.zip
+/xbean-4.21-source-release.zip
+/xbean-4.23-source-release.zip
+/xbean-4.24-source-release.zip

0001-Unbundle-ASM.patch

@@ -0,0 +1,42 @@
+From 4f7a61dcd47ed0dee2d78e31e2dd50b88ab42f25 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 12 Dec 2019 08:51:57 +0100
+Subject: [PATCH 2/3] Unbundle ASM
+
+---
+ .../xbean/recipe/XbeanAsmParameterNameLoader.java    | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+index 20b646c..9e96775 100644
+--- a/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
++++ b/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+@@ -17,11 +17,11 @@
+  */
+ package org.apache.xbean.recipe;
+ 
+-import org.apache.xbean.asm9.ClassReader;
+-import org.apache.xbean.asm9.ClassVisitor;
+-import org.apache.xbean.asm9.Label;
+-import org.apache.xbean.asm9.MethodVisitor;
+-import org.apache.xbean.asm9.Type;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassVisitor;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
+ 
+ import java.io.IOException;
+ import java.io.InputStream;
+@@ -36,7 +36,7 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.WeakHashMap;
+ 
+-import static org.apache.xbean.asm9.shade.commons.AsmConstants.ASM_VERSION;
++import static org.apache.xbean.asm9.original.commons.AsmConstants.ASM_VERSION;
+ 
+ /**
+  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
+-- 
+2.29.2
+

0002-Remove-dependency-on-log4j-and-commons-logging.patch

@@ -0,0 +1,35 @@
+From 28e37850d8343f44f82e3138c772dd65d1d0ff2f Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 12 Dec 2019 08:52:26 +0100
+Subject: [PATCH 3/3] Remove dependency on log4j and commons-logging
+
+---
+ .../xbean/propertyeditor/PropertyEditorRegistry.java | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java
+index e7e17edd..be302861 100644
+--- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java
++++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditorRegistry.java
+@@ -84,18 +84,6 @@ public class PropertyEditorRegistry implements Closeable {
+         register(new VectorEditor());
+         register(new WeakHashMapEditor());
+ 
+-        try {
+-            register(new Log4jConverter());
+-        } catch (final Throwable e) {
+-            // no-op
+-        }
+-
+-        try {
+-            register(new CommonsLoggingConverter());
+-        } catch (final Throwable e) {
+-            // no-op
+-        }
+-
+         return this;
+     }
+ 
+-- 
+2.21.0
+

changelog

@@ -0,0 +1,300 @@
+* Tue Aug 19 2025 Marian Koncek <mkoncek@redhat.com> - 4.24-9
+- Drop -javadoc subpackage
+
+* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 4.24-8
+- Rrevert to jdk21
+
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 4.24-7
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.24-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.24-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 4.24-3
+- Rebuilt for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 19 2023 Marian Koncek <mkoncek@redhat.com> - 4.24-1
+- Update to upstream version 4.24
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.23-2
+- Rebuild
+
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 4.23-1
+- Update to upstream version 4.23
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 4.21-1
+- Update to upstream version 4.21
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.18-7
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-5
+- Set explicit Java compiler source/target levels to 1.7
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
+- Enable xbean-finder
+- Resolves: rhbz#1969297
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 4.18-1
+- Update to upstream version 4.18
+
+* Wed Sep 09 2020 Fabio Valentini <decathorpe@gmail.com> - 4.15-6
+- Switch from log4j 1.2 compat package to log4j 1.2 API shim.
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 4.17-1
+- Update to upsteam version 4.17
+
+* Wed Jul 29 2020 Mat Booth <mat.booth@redhat.com> - 4.15-5
+- Remove springframework conditionals, the deps are a long time removed from
+  Fedora and this simplifies the spec a bit
+- Disable unused modules that can't build on JDK 11
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 4.15-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jun 25 2020 Jeff Johnston <jjohnstn@redhat.com> - 4.15-3
+- Fix JVM as 1.8.0 as package cannot be built with Java 9 and above
+
+* Fri May 15 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-4
+- Remove dependency on log4j and commons-logging
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Nov 13 2019 Fabio Valentini <decathorpe@gmail.com> - 4.15-1
+- Update to version 4.15.
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-3
+- Mass rebuild for javapackages-tools 201902
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.14-2
+- Disable all modules except xbean-reflect
+
+* Wed Sep 18 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-2
+- Migrate from the obsolete felix-osgi-core to osgi-core.
+
+* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 4.14-1
+- Update to version 4.14.
+
+* Sun Jul 28 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-5
+- Disable support for spring and groovy.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 09 2019 Fabio Valentini <decathorpe@gmail.com> - 4.9-3
+- Disable eclipse equinox functionality to fix the FTBFS issue on 32bit arches.
+
+* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 4.14-1
+- Update to upstream version 4.14
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.8-2
+- Mass rebuild for javapackages-tools 201901
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 07 2018 Michael Simacek <msimacek@redhat.com> - 4.9-1
+- Update to upstream version 4.9
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Apr 19 2018 Michael Simacek <msimacek@redhat.com> - 4.8-1
+- Update to upstream version 4.8
+
+* Tue Mar 13 2018 Michael Simacek <msimacek@redhat.com> - 4.6-1
+- Update to upstream version 4.6
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb  1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-6
+- Introduce groovy build conditional
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5
+- Fix build with conditionals
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-4
+- Port to current QDox
+
+* Thu Jun 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5-3
+- Add missing build-requires
+
+* Thu May 12 2016 Michael Simacek <msimacek@redhat.com> - 4.5-2
+- Enable xbean-asm-util
+
+* Mon May 02 2016 Michael Simacek <msimacek@redhat.com> - 4.5-1
+- Update to upstream version 4.5
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Nov 24 2015 Michael Simacek <msimacek@redhat.com> - 4.4-1
+- Update to upstream version 4.4
+- Rebase patches
+- Remove obsolete groovy patch
+
+* Mon Jul 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3-1
+- Update to upstream version 4.3
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-1
+- Update to upstream version 4.2
+
+* Thu Feb  5 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-2
+- Fix patch unshading ASM
+
+* Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.1-1
+- Update to upstream version 4.1
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Apr 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.17-1
+- Update to upstream version 3.17
+- Add patch for Eclipse Luna
+
+* Thu Dec  5 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.16-1
+- Update to upstream version 3.16
+
+* Thu Aug 08 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.13-4
+- Update to latest packaging guidelines
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13-2
+- Remove unneeded BR: maven-idea-plugin
+
+* Fri Mar 15 2013 Michal Srb <msrb@redhat.com> - 3.13-1
+- Update to upstream version 3.13
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 3.12-5
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Mon Dec 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-4
+- Enable xbean-spring, resolves rhbz#887496
+- Disable xbean-blueprint due to FTBFS
+
+* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-3
+- Replace eclipse-rcp requires with eclipse-equinox-osgi
+- Reenable Equinox
+
+* Tue Oct 16 2012 gil cattaneo <puntogil@libero.it> - 3.12-2
+- Enable xbean-blueprint and xbean-classloader modules
+
+* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-1
+- Update to upstream version 3.12
+
+* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-8
+- Revert previous changes.
+
+* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-7
+- Disable parts dependent on Eclipse (for bootstraping purpose).
+
+* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-6
+- Implement equinox and spring conditionals
+
+* Mon Sep  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-5
+- Fix eclipse requires
+
+* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-4
+- Fix felix-framework enabling patch
+
+* Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-3
+- Enable xbean-spring
+- Enable maven-xbean-plugin
+- Remove RPM bug workaround
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jul 13 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-1
+- Update to the upstream version 3.11.1
+- Force use of Equinox instead of Felix
+- Convert patch to POM macros
+
+* Thu May  3 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-5
+- Remove mx4j from deps (javax.management provided by JDK 1.5+)
+
+* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-4
+- BR felix-framework instead of felix-osgi-core.
+
+* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-3
+- Do not build equinox specific parts for RHEL.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec  6 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-1
+- Update to latest upstream version
+- Build with maven 3
+- Packaging & guidelines fixes
+
+* Sat May 28 2011 Marek Goldmann <mgoldman@redhat.com> - 3.7-7
+- Added xbean-finder and xbean-bundleutils submodules
+
+* Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-6
+- Add comment for removing javadoc
+- Fix maven 3 build
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-4
+- Fix pom filename (Resolves rhbz#655827)
+- Add depmap for main pom file
+- Fixes according to new guidelines (versionless jars, javadocs)
+
+* Fri Jul 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-3
+- Use javadoc:aggregate to generate javadocs
+
+* Fri Jul  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-2
+- Add license to javadoc subpackage
+
+* Mon Jun 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-1
+- First release

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: main
+execute:
+  how: tmt

sources

@@ -1 +1 @@
-f6c2530fc686f9ceac784dda1aded15c  xbean-3.12.tar.xz
+SHA512 (xbean-4.24-source-release.zip) = c88fc635e6365335cb8b78b28ac1324be0970e0d2bc000f5f43ff40d4ce6fbed04a61006788873dc0819e8f80913f40b2da4b9b264c2fe81e78ffcde5dd85e65

xbean.depmap

@@ -1,50 +0,0 @@
-<dependencies>
-    <dependency>
-      <maven>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>4.2.0</version>
-      </maven>
-      <jpp>
-        <groupId>JPP/felix</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>1.2.0</version>
-      </jpp>
-    </dependency>
-     <dependency>
-      <maven>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>3.1</version>
-      </maven>
-      <jpp>
-        <groupId>JPP/objectweb-asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <version>3.2</version>
-      </jpp>
-    </dependency>
-    <dependency>
-      <maven>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>3.1</version>
-      </maven>
-      <jpp>
-        <groupId>JPP/objectweb-asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>3.2</version>
-      </jpp>
-    </dependency>
-    <dependency>
-      <maven>
-        <groupId>asm</groupId>
-        <artifactId>asm-tree</artifactId>
-        <version>3.1</version>
-      </maven>
-      <jpp>
-        <groupId>JPP/objectweb-asm</groupId>
-        <artifactId>asm-tree</artifactId>
-        <version>3.2</version>
-      </jpp>
-    </dependency>
-</dependencies>

xbean.spec

@@ -1,80 +1,32 @@
-# Conditionals to help breaking eclipse <-> xbean dependency cycle
-# when bootstrapping for new architectures
-%if 0%{?fedora}
-%bcond_without equinox
-%bcond_without spring
-%endif
+%bcond_with bootstrap
 
 Name:           xbean
-Version:        3.12
-BuildArch:      noarch
-
-Release:        4%{?dist}
+Version:        4.24
+Release:        %autorelease
 Summary:        Java plugin based web server
+License:        Apache-2.0
+URL:            https://geronimo.apache.org/xbean/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Group:          Development/Libraries
-License:        ASL 2.0
-URL:            http://geronimo.apache.org/xbean/
+Source0:        https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-# unfortunately no source/binary releases are being made lately, just
-# tags in repos and binary releases in maven repositories
-# svn export http://svn.apache.org/repos/asf/geronimo/xbean/tags/%{name}-%{version}
-# tar caf %{name}-%{version}.tar.xz %{name}-%{version}
-Source0:        xbean-%{version}.tar.xz
-Source1:        xbean.depmap
+Patch:          0001-Unbundle-ASM.patch
+Patch:          0002-Remove-dependency-on-log4j-and-commons-logging.patch
 
-BuildRequires:  java-devel
-BuildRequires:  apache-commons-beanutils
-BuildRequires:  apache-commons-logging
-BuildRequires:  objectweb-asm
-BuildRequires:  ant
-BuildRequires:  qdox
-BuildRequires:  slf4j
-BuildRequires:  maven
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-idea-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-site-plugin
-BuildRequires:  maven-shade-plugin
-%if %{with equinox}
-BuildRequires:  eclipse-equinox-osgi
+# TODO Remove in Fedora 47
+Obsoletes:      %{name}-javadoc < 4.24-9
+
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  felix-framework
-%endif
-%if %{with spring}
-BuildRequires:  apache-commons-jexl
-BuildRequires:  aries-blueprint
-# test deps BuildRequires:  cglib
-BuildRequires:  felix-osgi-compendium
-BuildRequires:  felix-osgi-core
-BuildRequires:  geronimo-annotation
-BuildRequires:  pax-logging
-
-BuildRequires:  maven-archiver
-BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-project
-BuildRequires:  plexus-archiver
-BuildRequires:  plexus-utils
-BuildRequires:  springframework
-BuildRequires:  springframework-beans
-BuildRequires:  springframework-context
-BuildRequires:  springframework-web
-%endif
-
-Requires:       java
-Requires:       apache-commons-logging
-Requires:       objectweb-asm
-Requires:       slf4j
-%if %{with equinox}
-Requires:       eclipse-equinox-osgi
-%else
-Requires:       felix-framework
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
+BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
 %endif
 
 %description
@@ -86,285 +38,48 @@ support for running with no IoC system, JMX without JMX code,
 lifecycle and class loader management, and a rock solid Spring
 integration.
 
-%if %{with spring}
-# For now blueprint module fails to compile. Disable it.
-%if 0
-%package        blueprint
-Summary:        Schema-driven namespace handler for Apache Aries Blueprint
-Requires:       %{name} = %{version}-%{release}
-Requires:       apache-commons-jexl
-Requires:       aries-blueprint
-Requires:       felix-osgi-compendium
-Requires:       geronimo-annotation
-Requires:       pax-logging
-
-%description    blueprint
-This package provides %{summary}.
-%endif
-
-%package        classloader
-Summary:        A flexibie multi-parent classloader
-# maven-xbean-plugin
-Requires:       %{name} = %{version}-%{release}
-Requires:       springframework-beans
-
-%description    classloader
-This package provides %{summary}.
-
-%package        spring
-Summary:        Schema-driven namespace handler for spring contexts
-Requires:       %{name} = %{version}-%{release}
-Requires:       springframework-beans
-Requires:       springframework-context
-Requires:       springframework-web
-
-%description    spring
-This package provides %{summary}.
-
-%package        -n maven-%{name}-plugin
-Summary:        XBean plugin for Apache Maven
-Requires:       %{name}-spring = %{version}-%{release}
-Requires:       maven
-Requires:       maven-archiver
-Requires:       maven-project
-Requires:       plexus-archiver
-Requires:       plexus-utils
-Requires:       qdox
-Requires:       springframework
-Requires:       springframework-beans
-Requires:       springframework-context
-Requires:       springframework-web
-
-%description    -n maven-%{name}-plugin
-This package provides %{summary}.
-%endif
-
-%package        javadoc
-Summary:        API documentation for %{name}
-Group:          Documentation
-
-%description    javadoc
-This package provides %{summary}.
-
 %prep
-%setup -q
-# build failing on this due to doxia-sitetools problems
-rm src/site/site.xml
+%autosetup -p1 -C
 
+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
-%pom_remove_dep mx4j:mx4j
-%pom_remove_dep :xbean-asm-shaded xbean-reflect
 
-# These aren't needed for now
-%pom_disable_module xbean-asm-shaded
+%pom_disable_module xbean-classloader
+%pom_disable_module xbean-classpath
+%pom_disable_module xbean-bundleutils
+%pom_disable_module xbean-asm9-shaded
 %pom_disable_module xbean-finder-shaded
-%pom_disable_module xbean-telnet
-
-# Prevent modules depending on springframework from building.
-%if %{without spring}
-   %pom_remove_dep org.springframework:
-   #%%pom_disable_module xbean-blueprint
-   %pom_disable_module xbean-classloader
-   %pom_disable_module xbean-spring
-   %pom_disable_module maven-xbean-plugin
-%endif
-# blueprint FTBFS, disable for now
+%pom_disable_module xbean-naming
 %pom_disable_module xbean-blueprint
+%pom_disable_module xbean-spring
+%pom_disable_module xbean-telnet
+%pom_disable_module maven-xbean-plugin
 
+%pom_remove_dep :commons-logging-api xbean-reflect
+%pom_remove_dep :log4j xbean-reflect
+%pom_remove_dep :xbean-asm9-shaded xbean-reflect
+find -name CommonsLoggingConverter.java -delete
+find -name Log4jConverter.java -delete
 
-# Replace generic OSGi dependencies with either Equinox or Felix
-%pom_remove_dep :org.osgi.core xbean-bundleutils
-%pom_remove_dep org.eclipse:osgi xbean-bundleutils
-%if %{with equinox}
-  %pom_add_dep org.eclipse.osgi:org.eclipse.osgi xbean-bundleutils
-%else
-  rm -rf xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox/
-  %pom_add_dep org.apache.felix:org.apache.felix.framework xbean-bundleutils
-%endif
+# Plugins useful for upstream only
+%pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-source-plugin
 
+%pom_remove_dep :xbean-bundleutils xbean-finder
+rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
 
-# Fix dependency on xbean-asm-shaded to original objectweb-asm
-sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
-    xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
-
-# disable copy of internal aries-blueprint
-sed -i "s|<Private-Package>|<!--Private-Package>|" xbean-blueprint/pom.xml
-sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
-
-# Fix ant groupId
-find -name pom.xml -exec sed -i "s|<groupId>ant</groupId>|<groupId>org.apache.ant</groupId>|" {} \;
-# Fix cglib artifactId
-find -name pom.xml -exec sed -i "s|<artifactId>cglib-nodep</artifactId>|<artifactId>cglib</artifactId>|" {} \;
+# Disable one test that fails on JVM 11
+sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
 
 %build
-mvn-rpmbuild -e \
-        -Dmaven.compiler.source=1.5 \
-        -Dmaven.compiler.target=1.5 \
-        -Dmaven.local.depmap.file="%{SOURCE1}" \
-        -Dmaven.test.skip=true \
-        install javadoc:aggregate
-
+%mvn_build --force -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
-install -dm 755 $RPM_BUILD_ROOT/%{_javadir}/%{name}
-install -dm 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
-install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}
-install -dm 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
+%mvn_install
 
-# parent pom
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_maven_depmap JPP.%{name}-main.pom
+%files -f .mfiles
+%license LICENSE NOTICE
 
-for sub in bundleutils classpath finder naming reflect; do
-    install -m 644 %{name}-${sub}/target/%{name}-${sub}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-${sub}.jar
-    install -pm 644 %{name}-${sub}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${sub}.pom
-    %add_maven_depmap JPP.%{name}-%{name}-${sub}.pom %{name}/%{name}-${sub}.jar
-done
-
-%if %{with spring}
-   for m in classloader spring; do  # blueprint should be there too
-       install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-${m}.jar;
-       install -pm 644 %{name}-${m}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-       %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar -f ${m}
-   done
-   # maven-xbean-plugin
-   install -m 644 maven-%{name}-plugin/target/maven-%{name}-plugin-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/maven-%{name}-plugin.jar
-   install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-maven-%{name}-plugin.pom
-   %add_maven_depmap JPP.%{name}-maven-%{name}-plugin.pom %{name}/maven-%{name}-plugin.jar -f maven-plugin
-%endif
-
-# javadocs
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%files
-%doc LICENSE NOTICE
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-bundleutils.jar
-%{_javadir}/%{name}/%{name}-classpath.jar
-%{_javadir}/%{name}/%{name}-finder.jar
-%{_javadir}/%{name}/%{name}-naming.jar
-%{_javadir}/%{name}/%{name}-reflect.jar
-%{_mavenpomdir}/JPP.%{name}-main.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-bundleutils.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-classpath.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-finder.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-naming.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-reflect.pom
-%{_mavendepmapfragdir}/%{name}
-
-%if %{with spring}
-%if 0
-%files blueprint
-%doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd*
-%{_javadir}/%{name}/%{name}-blueprint.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-blueprint.pom
-%{_mavendepmapfragdir}/%{name}-blueprint
-%endif
-
-%files classloader
-%doc LICENSE NOTICE
-%{_javadir}/%{name}/%{name}-classloader.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-classloader.pom
-%{_mavendepmapfragdir}/%{name}-classloader
-
-%files spring
-%doc LICENSE NOTICE
-%{_javadir}/%{name}/%{name}-spring.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-spring.pom
-%{_mavendepmapfragdir}/%{name}-spring
-
-%files -n maven-%{name}-plugin
-%doc LICENSE NOTICE
-%{_javadir}/%{name}/maven-%{name}-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-maven-%{name}-plugin.pom
-%{_mavendepmapfragdir}/%{name}-maven-plugin
-%endif
-
-%files javadoc
-%doc LICENSE NOTICE
-%{_javadocdir}/%{name}
-
-%changelog
-* Mon Dec 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-4
-- Enable xbean-spring, resolves rhbz#887496
-- Disable xbean-blueprint due to FTBFS
-
-* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-3
-- Replace eclipse-rcp requires with eclipse-equinox-osgi
-- Reenable Equinox
-
-* Tue Oct 16 2012 gil cattaneo <puntogil@libero.it> - 3.12-2
-- Enable xbean-blueprint and xbean-classloader modules
-
-* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-1
-- Update to upstream version 3.12
-
-* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-8
-- Revert previous changes.
-
-* Wed Oct 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.11.1-7
-- Disable parts dependent on Eclipse (for bootstraping purpose).
-
-* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-6
-- Implement equinox and spring conditionals
-
-* Mon Sep  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-5
-- Fix eclipse requires
-
-* Mon Aug 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-4
-- Fix felix-framework enabling patch
-
-* Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-3
-- Enable xbean-spring
-- Enable maven-xbean-plugin
-- Remove RPM bug workaround
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jul 13 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.1-1
-- Update to the upstream version 3.11.1
-- Force use of Equinox instead of Felix
-- Convert patch to POM macros
-
-* Thu May  3 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-5
-- Remove mx4j from deps (javax.management provided by JDK 1.5+)
-
-* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-4
-- BR felix-framework instead of felix-osgi-core.
-
-* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-3
-- Do not build equinox specific parts for RHEL.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec  6 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.8-1
-- Update to latest upstream version
-- Build with maven 3
-- Packaging & guidelines fixes
-
-* Sat May 28 2011 Marek Goldmann <mgoldman@redhat.com> - 3.7-7
-- Added xbean-finder and xbean-bundleutils submodules
-
-* Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-6
-- Add comment for removing javadoc
-- Fix maven 3 build
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-4
-- Fix pom filename (Resolves rhbz#655827)
-- Add depmap for main pom file
-- Fixes according to new guidelines (versionless jars, javadocs)
-
-* Fri Jul 30 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-3
-- Use javadoc:aggregate to generate javadocs
-
-* Fri Jul  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-2
-- Add license to javadoc subpackage
-
-* Mon Jun 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-1
-- First release
+%autochangelog