.gitignore

@@ -1 +1 @@
-SOURCES/plexus-containers-2.1.0.tar.gz
+SOURCES/plexus-containers-2.0.0.tar.gz

.plexus-containers.metadata

@@ -1 +1 @@
-66d8b7fc585e77ca4afc8bef01f646e96940cecf SOURCES/plexus-containers-2.1.0.tar.gz
+62fe39da30dfb4e15e7dd5ecd9d4b5205895d32b SOURCES/plexus-containers-2.0.0.tar.gz

SPECS/plexus-containers.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           plexus-containers
-Version:        2.1.0
-Release:        11%{?dist}
+Version:        2.0.0
+Release:        2%{?dist}
 Summary:        Containers for Plexus
 # Most of the files are either under ASL 2.0 or MIT
 # The following files are under xpp:
@@ -16,10 +14,7 @@ Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
 
-BuildRequires:  maven-local-openjdk8
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(junit:junit)
@@ -35,7 +30,6 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  mvn(org.jdom:jdom2)
 BuildRequires:  mvn(org.ow2.asm:asm)
-%endif
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -51,7 +45,7 @@ Summary:        Component metadata from %{name}
 %description component-metadata
 %{summary}.
 
-%package component-annotations
+%package -n %{?module_prefix}%{name}-component-annotations
 Summary:        Component API from %{name}
 
 %description -n %{?module_prefix}%{name}-component-annotations
@@ -100,12 +94,8 @@ cp %{SOURCE2} .
 # keep compat symlink for maven's sake
 %mvn_file ":plexus-component-annotations" %{name}/plexus-component-annotations plexus/containers-component-annotations
 
-# remove some broken tests
-rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/merge/ComponentsXmlMergerTest.java
-rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultComponentDescriptorWriterTest.java
-
 %build
-%mvn_build -s
+%mvn_build -f -s
 
 %install
 %mvn_install
@@ -113,76 +103,26 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC
 # plexus-containers pom goes into main package
 %files -f .mfiles-plexus-containers
 %license LICENSE-2.0.txt LICENSE.MIT
-
-%files component-annotations -f .mfiles-plexus-component-annotations
+%files -n %{?module_prefix}%{name}-component-annotations -f .mfiles-plexus-component-annotations
 %license LICENSE-2.0.txt LICENSE.MIT
-
 %files container-default -f .mfiles-plexus-container-default
 %license LICENSE-2.0.txt LICENSE.MIT
-
 %files component-metadata -f .mfiles-plexus-component-metadata
 %license LICENSE-2.0.txt LICENSE.MIT
 
 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.1.0-11
-- Rebuild with regenerated Requires on Java
-
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-10
-- Rebuild to regenerate auto-requires
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.0-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-8
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-7
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-6
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2.1.0-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-2
-- Build with OpenJDK 8
-
-* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 2.1.0-1
-- Update to upstream version 2.1.0
+* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.0.0-2
+- Rebuilt for MSVSphere 8.9
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0-2
 - Mass rebuild for javapackages-tools 201902
 
-* Thu Oct 24 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-1
-- Update to version 2.1.0.
-
-* Tue Aug 20 2019 Fabio Valentini <decathorpe@gmail.com> - 2.0.0-1
-- Update to version 2.0.0.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Thu May 30 2019 Marian Koncek <mkoncek@redhat.com> - 2.0.0-1
 - Update to upstream version 2.0.0
 
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.1-9
 - Mass rebuild for javapackages-tools 201901
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 1.7.1-8
 - Fix license tag
 - Include missing license files