.gitignore

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

.plexus-containers.metadata

@@ -1 +1 @@
-62fe39da30dfb4e15e7dd5ecd9d4b5205895d32b SOURCES/plexus-containers-2.0.0.tar.gz
+1f56043b183fce4bc53472afcaf89b21588c1e25 SOURCES/plexus-containers-2.1.1.tar.gz

SPECS/plexus-containers.spec

@@ -1,6 +1,8 @@
+%bcond_with bootstrap
+
 Name:           plexus-containers
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        3%{?dist}
 Summary:        Containers for Plexus
 # Most of the files are either under ASL 2.0 or MIT
 # The following files are under xpp:
@@ -9,12 +11,16 @@ Summary:        Containers for Plexus
 License:        ASL 2.0 and MIT and xpp
 URL:            https://github.com/codehaus-plexus/plexus-containers
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 Source2:        LICENSE.MIT
 
-BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap-openjdk8
+%else
+BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(junit:junit)
@@ -30,6 +36,7 @@ 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
@@ -45,7 +52,7 @@ Summary:        Component metadata from %{name}
 %description component-metadata
 %{summary}.
 
-%package -n %{?module_prefix}%{name}-component-annotations
+%package component-annotations
 Summary:        Component API from %{name}
 
 %description -n %{?module_prefix}%{name}-component-annotations
@@ -67,8 +74,6 @@ cp %{SOURCE2} .
 
 %pom_remove_plugin -r :maven-site-plugin
 
-%pom_change_dep -r :google-collections com.google.guava:guava
-
 # Generate OSGI info
 %pom_xpath_inject "pom:project" "
     <packaging>bundle</packaging>
@@ -94,8 +99,12 @@ 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 -f -s
+%mvn_build -s
 
 %install
 %mvn_install
@@ -103,23 +112,79 @@ cp %{SOURCE2} .
 # plexus-containers pom goes into main package
 %files -f .mfiles-plexus-containers
 %license LICENSE-2.0.txt LICENSE.MIT
-%files -n %{?module_prefix}%{name}-component-annotations -f .mfiles-plexus-component-annotations
+
+%files 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
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-3
+- Rebuild to regenerate auto-requires
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-1
+- Update to upstream version 2.1.1
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.1.0-9
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-7
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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 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