diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec
index 0544ab8..569550d 100644
--- a/plexus-component-metadata.spec
+++ b/plexus-component-metadata.spec
@@ -20,7 +20,7 @@
 %global comp_name plexus-component-metadata
 %bcond_with tests
 Name:           %{comp_name}
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -42,10 +42,10 @@ BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-model)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.ow2.asm:asm) >= 7
 #!BuildRequires: maven-compiler-plugin-bootstrap
@@ -77,20 +77,8 @@ Group:          Documentation/HTML
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
-%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
-%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -111,7 +99,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
     </build>" plexus-component-annotations
 
 # Fix build with maven-plugin-plugin >= 3.11.0
-%pom_xpath_inject "pom:project/pom:build" "
+%pom_xpath_inject "pom:project" "
+  <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -120,7 +109,8 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
           <goalPrefix>plexus-component-metadata</goalPrefix>
         </configuration>
       </plugin>
-    </plugins>" plexus-component-metadata
+    </plugins>
+  </build>" plexus-component-metadata
 
 # to prevent ant from failing
 mkdir -p plexus-component-annotations/src/test/java
diff --git a/plexus-containers-2.1.1.tar.gz b/plexus-containers-2.1.1.tar.gz
deleted file mode 100644
index 286adc2..0000000
--- a/plexus-containers-2.1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b764d9beb36143a180308f7600a58e2192ad7e70e8951acd4e2136a102ee525
-size 348039
diff --git a/plexus-containers-2.2.0.tar.gz b/plexus-containers-2.2.0.tar.gz
new file mode 100644
index 0000000..c9f9624
--- /dev/null
+++ b/plexus-containers-2.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9525732daf1d2a994b7aeab477319228042f791dbb61a75de257726f10cdb013
+size 72554
diff --git a/plexus-containers-build.tar.xz b/plexus-containers-build.tar.xz
index 39e0138..e2f80e6 100644
--- a/plexus-containers-build.tar.xz
+++ b/plexus-containers-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94424674d152720089c3fbc4a563596bd2b0d41b9a59ddf014a165ef5e9ab480
-size 4984
+oid sha256:e6544a262c96e2b2cd20b39c2231a9831a0959c0c78d620c919492cb28eb4aa5
+size 4816
diff --git a/plexus-containers.spec b/plexus-containers.spec
index fdb2bde..0aed2d6 100644
--- a/plexus-containers.spec
+++ b/plexus-containers.spec
@@ -18,7 +18,7 @@
 
 %bcond_with tests
 Name:           plexus-containers
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Containers for Plexus
 # Most of the files are either under ASL 2.0 or MIT
@@ -61,13 +61,6 @@ Group:          Development/Libraries/Java
 %description component-annotations
 %{summary}.
 
-%package container-default
-Summary:        Default Container from %{name}
-Group:          Development/Libraries/Java
-
-%description container-default
-%{summary}.
-
 %package javadoc
 Summary:        API documentation for all plexus-containers packages
 Group:          Documentation/HTML
@@ -87,20 +80,8 @@ build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
-
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
-%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
-%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -124,46 +105,32 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 mkdir -p plexus-component-annotations/src/test/java
 
 %build
-for i in plexus-component-annotations plexus-container-default; do
-  pushd ${i}
-    %{ant} \
+pushd plexus-component-annotations
+  %{ant} \
 %if %{without tests}
-      -Dtest.skip=true \
+    -Dtest.skip=true \
 %endif
-      jar javadoc
-  popd
-done
+    jar javadoc
+popd
 
 %install
 # jars
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
-  install -pm 0644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
-done
-install -dm 0755 %{buildroot}%{_javadir}/plexus
-# keep compat symlink for maven's sake
-ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexus/containers-component-annotations.jar
+install -pm 0644 plexus-component-annotations/target/plexus-component-annotations-%{version}.jar \
+    %{buildroot}%{_javadir}/%{name}/plexus-component-annotations.jar
 
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
-  %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-done
-%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations
-%add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api
+%{mvn_install_pom} plexus-component-annotations/pom.xml \
+    %{buildroot}%{_mavenpomdir}/%{name}/plexus-component-annotations.pom
+%add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar
 
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
-for i in plexus-component-annotations plexus-container-default; do
-  cp -pr ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
-done
+cp -pr plexus-component-annotations/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/plexus-component-annotations
 %fdupes -s %{buildroot}%{_javadocdir}
 
-%files component-annotations -f .mfiles-component-annotations
-%license LICENSE-2.0.txt LICENSE.MIT
-%{_javadir}/plexus
-
-%files container-default -f .mfiles-container-default
+%files component-annotations -f .mfiles
 %license LICENSE-2.0.txt LICENSE.MIT
 
 %files javadoc
diff --git a/plexus-metadata-generator-nomojo.patch b/plexus-metadata-generator-nomojo.patch
new file mode 100644
index 0000000..4d0381e
--- /dev/null
+++ b/plexus-metadata-generator-nomojo.patch
@@ -0,0 +1,22 @@
+--- plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2024-05-15 18:50:14.906335826 +0200
++++ plexus-containers-2.2.0/plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/ClassComponentDescriptorExtractor.java	2024-05-15 18:52:35.743977916 +0200
+@@ -23,7 +23,6 @@
+ import java.util.List;
+ import java.util.Map;
+ 
+-import org.apache.maven.plugin.MojoExecutionException;
+ import org.codehaus.plexus.component.annotations.Component;
+ import org.codehaus.plexus.component.repository.ComponentDescriptor;
+ import org.codehaus.plexus.metadata.gleaner.AnnotationComponentGleaner;
+@@ -81,11 +80,7 @@
+ 
+         // Add the projects dependencies
+         for (String filename : elements) {
+-            try {
+                 list.add(new File(filename).toURI().toURL());
+-            } catch (MalformedURLException e) {
+-                throw new MojoExecutionException("Invalid classpath entry: " + filename, e);
+-            }
+         }
+ 
+         URL[] urls = list.toArray(new URL[list.size()]);
diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec
index 8692ec5..e1bc77f 100644
--- a/plexus-metadata-generator.spec
+++ b/plexus-metadata-generator.spec
@@ -20,7 +20,7 @@
 %global comp_name component-metadata
 %bcond_with tests
 Name:           plexus-metadata-generator
-Version:        2.1.1
+Version:        2.2.0
 Release:        0
 Summary:        Component metadata from %{base_name}
 # Most of the files are either under ASL 2.0 or MIT
@@ -46,10 +46,10 @@ BuildRequires:  objectweb-asm >= 7
 BuildRequires:  plexus-classworlds
 BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  qdox >= 2
+BuildRequires:  sisu-plexus
 BuildRequires:  xbean
 Requires:       apache-commons-cli
 Requires:       guava
@@ -57,10 +57,10 @@ Requires:       jdom2
 Requires:       objectweb-asm >= 7
 Requires:       plexus-cli
 Requires:       plexus-containers-component-annotations = %{version}
-Requires:       plexus-containers-container-default = %{version}
 Requires:       plexus-utils
 Requires:       plexus-xml
 Requires:       qdox >= 2
+Requires:       sisu-plexus
 Requires:       xbean
 BuildArch:      noarch
 %if %{with tests}
@@ -85,7 +85,7 @@ Group:          Documentation/HTML
 %setup -q -n %{base_name}-%{base_name}-%{version} -a100
 
 mkdir -p lib
-build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
+build-jar-repository -s lib %{base_name} org.eclipse.sisu.plexus objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli
 %if %{with tests}
 build-jar-repository -s lib hamcrest/core xbean/xbean-reflect
 %endif
@@ -101,16 +101,6 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy
 
 %pom_remove_plugin -r :maven-site-plugin
 
-# For Maven 3 compat
-%pom_add_dep org.apache.maven:maven-core plexus-component-metadata
-
-# ASM dependency was changed to "provided" in XBean 4.x, so we need to provide ASM
-%pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default
-%pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default
-
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default
-%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-%{comp_name}
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -165,7 +155,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 # script
-%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
+%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:org.eclipse.sisu.plexus:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name}
 
 %files -f .mfiles
 %license LICENSE-2.0.txt LICENSE.MIT