diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d3b43c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/xbean-4.18-source-release.zip
diff --git a/.xbean.metadata b/.xbean.metadata
new file mode 100644
index 0000000..5fb1f82
--- /dev/null
+++ b/.xbean.metadata
@@ -0,0 +1 @@
+3dd044457b459b0114bf218c52ff6af4d7bf7001 SOURCES/xbean-4.18-source-release.zip
diff --git a/SOURCES/0001-Remove-unused-import.patch b/SOURCES/0001-Remove-unused-import.patch
new file mode 100644
index 0000000..c0a9a2f
--- /dev/null
+++ b/SOURCES/0001-Remove-unused-import.patch
@@ -0,0 +1,25 @@
+From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 12 Dec 2019 08:51:36 +0100
+Subject: [PATCH 1/3] Remove unused import
+
+---
+ .../java/org/apache/xbean/propertyeditor/PropertyEditors.java | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
+index dda3bf4d..5c6285f2 100644
+--- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
++++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
+@@ -19,8 +19,6 @@ package org.apache.xbean.propertyeditor;
+ import java.beans.PropertyEditorManager;
+ import java.lang.reflect.Type;
+
+-import com.sun.org.apache.regexp.internal.RE;
+-
+ /**
+ * The property editor manager. This orchestrates Geronimo usage of
+ * property editors, allowing additional search paths to be added and
+--
+2.21.0
+
diff --git a/SOURCES/0002-Unbundle-ASM.patch b/SOURCES/0002-Unbundle-ASM.patch
new file mode 100644
index 0000000..eb40658
--- /dev/null
+++ b/SOURCES/0002-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
+
diff --git a/SOURCES/0003-Remove-dependency-on-log4j-and-commons-logging.patch b/SOURCES/0003-Remove-dependency-on-log4j-and-commons-logging.patch
new file mode 100644
index 0000000..b1846ee
--- /dev/null
+++ b/SOURCES/0003-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
+
diff --git a/SPECS/xbean.spec b/SPECS/xbean.spec
new file mode 100644
index 0000000..719f16f
--- /dev/null
+++ b/SPECS/xbean.spec
@@ -0,0 +1,324 @@
+%bcond_with bootstrap
+
+Name: xbean
+Version: 4.18
+Release: 5%{?dist}
+Summary: Java plugin based web server
+License: ASL 2.0
+URL: https://geronimo.apache.org/xbean/
+BuildArch: noarch
+
+Source0: https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
+Patch1: 0001-Remove-unused-import.patch
+Patch2: 0002-Unbundle-ASM.patch
+Patch3: 0003-Remove-dependency-on-log4j-and-commons-logging.patch
+
+BuildRequires: maven-local
+%if %{with bootstrap}
+BuildRequires: javapackages-bootstrap
+%else
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.ow2.asm:asm)
+BuildRequires: mvn(org.ow2.asm:asm-commons)
+%endif
+
+%description
+The goal of XBean project is to create a plugin based server
+analogous to Eclipse being a plugin based IDE. XBean will be able to
+discover, download and install server plugins from an Internet based
+repository. In addition, we include support for multiple IoC systems,
+support for running with no IoC system, JMX without JMX code,
+lifecycle and class loader management, and a rock solid Spring
+integration.
+
+%package javadoc
+Summary: API documentation for %{name}
+
+%description javadoc
+This package provides %{summary}.
+
+%prep
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+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 :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
+
+# Plugins useful for upstream only
+%pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-source-plugin
+
+%build
+%mvn_build -- -f xbean-reflect
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%license LICENSE NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
+
+%changelog
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 4.18-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+ Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-4
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.18-3
+- Bootstrap Maven for CentOS Stream 9
+
+* 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