.gitignore

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

.plexus-containers.metadata

@@ -1 +1 @@
-66d8b7fc585e77ca4afc8bef01f646e96940cecf SOURCES/plexus-containers-2.1.0.tar.gz
+abf5e10f3df5d6f41ab16bd3639664951733bfc8 SOURCES/plexus-containers-2.2.0.tar.gz

SPECS/plexus-containers.spec

@@ -1,40 +1,39 @@
 %bcond_with bootstrap
 
 Name:           plexus-containers
-Version:        2.1.0
-Release:        11%{?dist}
+Version:        2.2.0
+Release:        4%{?dist}
 Summary:        Containers for Plexus
-# Most of the files are either under ASL 2.0 or MIT
+# Most of the files are either under Apache-2.0 or MIT
 # The following files are under xpp:
 # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java
 # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java
-License:        ASL 2.0 and MIT and xpp
+License:        Apache-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-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
-BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 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.apache.maven.plugins:maven-plugin-plugin)
-BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
-BuildRequires:  mvn(org.apache.xbean:xbean-reflect)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-classworlds)
-BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-testing)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.jdom:jdom2)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
 BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.slf4j:slf4j-simple)
 %endif
 
 %description
@@ -54,91 +53,90 @@ Summary:        Component metadata from %{name}
 %package component-annotations
 Summary:        Component API from %{name}
 
-%description -n %{?module_prefix}%{name}-component-annotations
-%{summary}.
-
-%package container-default
-Summary:        Default Container from %{name}
-
-%description container-default
+%description component-annotations
 %{summary}.
 
 %{?javadoc_package}
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-
 cp %{SOURCE1} .
 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>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <_nouses>true</_nouses>
-              <Export-Package>org.codehaus.plexus.component.annotations.*</Export-Package>
-            </instructions>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>" plexus-component-annotations
-
-# plexus-component-api has been merged into plexus-container-default
-%mvn_alias ":plexus-container-default" "org.codehaus.plexus:containers-component-api"
-
-# 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
 
+%mvn_package :plexus-containers __noinstall
+
 %build
 %mvn_build -s
 
 %install
 %mvn_install
 
-# 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
 %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
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2.0-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.2.0-3
+- Rebuilt for MSVSphere 10
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.2.0-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.2.0-2
+- Bump release for June 2024 mass rebuild
+
+* Sat Feb 03 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2.0-1
+- Update to upstream version 2.2.0
+- Drop obsolete plexus-containers-container-default
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-7
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-6
+- Rebuild
+
+* Thu Aug 10 2023 Marian Koncek <mkoncek@redhat.com> - 2.1.1-5
+- Use implicit maven toolchains
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-10
-- Rebuild to regenerate auto-requires
+* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-1
+- Update to upstream version 2.1.1
 
-* 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
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.1.0-9
+- Rebuilt for java-17-openjdk as system jdk
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-8
-- Rebuild to workaround DistroBaker issue
+* 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 Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-7
-- Bootstrap Maven for CentOS Stream 9
+* 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