.gitignore

@@ -1 +1 @@
-SOURCES/plexus-sec-dispatcher-1.4.tar.bz2
+SOURCES/plexus-sec-dispatcher-2.0.tar.gz

.plexus-sec-dispatcher.metadata

@@ -1 +1 @@
-a9459956c9e9ad24248c332e137c59fec894e1b7 SOURCES/plexus-sec-dispatcher-1.4.tar.bz2
+3932b05932194e4baf8703a7543f8d97ed7634ab SOURCES/plexus-sec-dispatcher-2.0.tar.gz

SOURCES/plexus-sec-dispatcher-pom.patch

@@ -1,32 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 1eb2158..7e7ac5d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -25,25 +25,17 @@
-     <plugins>
-       <plugin>
-         <groupId>org.codehaus.plexus</groupId>
--        <artifactId>plexus-maven-plugin</artifactId>
-+        <artifactId>plexus-component-metadata</artifactId>
-         <version>1.3.5</version>
-         <executions>
-           <execution>
-             <goals>
--              <goal>descriptor</goal>
-+              <goal>generate-metadata</goal>
-             </goals>
-           </execution>
-         </executions>
-       </plugin>
-       <plugin>
--        <artifactId>maven-compiler-plugin
--        </artifactId>
--        <configuration>
--          <source>1.4</source>
--          <target>1.4</target>
--        </configuration>
--      </plugin>
--      <plugin>
-         <groupId>org.codehaus.modello</groupId>
-         <artifactId>modello-maven-plugin</artifactId>
-         <configuration>

SPECS/plexus-sec-dispatcher.spec

@@ -1,78 +1,101 @@
 %bcond_with bootstrap
 
 Name:           plexus-sec-dispatcher
-Version:        1.4
-Release:        39%{?dist}
+Version:        2.0
+Release:        14%{?dist}
 Summary:        Plexus Security Dispatcher Component
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://github.com/codehaus-plexus/plexus-sec-dispatcher
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-# svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/
-# tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/
-Source0:        %{name}-%{version}.tar.bz2
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 
-# Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
-Patch0:         %{name}-pom.patch
-
-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
-BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
 %endif
 
 %description
 Plexus Security Dispatcher Component
 
-%{?module_package}
 %{?javadoc_package}
 
 %prep
-%setup -q
-%patch -P 0 -p1
+%autosetup -n %{name}-%{name}-%{version}
 
 cp %{SOURCE1} .
 
 %pom_remove_parent
-%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+
+%pom_xpath_inject 'pom:project' '<groupId>org.codehaus.plexus</groupId>'
 
 %mvn_file : plexus/%{name}
 
+%mvn_alias org.codehaus.plexus: org.sonatype.plexus:
+
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE-2.0.txt
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.4-39
-- Fix patch usage
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.0-14
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.0-13
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0-12
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-9
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-8
+- Convert License tag to SPDX format
+
+* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
+- Build with default JDK 17
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.4-38
-- Rebuild with regenerated Requires on Java
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-37
-- Rebuild to regenerate auto-requires
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0-3
+- Rebuilt for java-17-openjdk as system jdk
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-36
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-35
-- Rebuild to workaround DistroBaker issue
+* Tue Oct 19 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.0-1
+- Update to version 2.0
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-34
-- Bootstrap Maven for CentOS Stream 9
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-33
 - Bootstrap build