.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,27 +1,27 @@
+%bcond_with bootstrap
+
 Name:           plexus-sec-dispatcher
-Version:        1.4
-Release:        29%{?dist}
+Version:        2.0
+Release:        4%{?dist}
 Summary:        Plexus Security Dispatcher Component
 License:        ASL 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
-
-# Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
-Patch0:         %{name}-pom.patch
+Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap-openjdk8
+%else
 BuildRequires:  maven-local-openjdk8
 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:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
 BuildRequires:  %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher)
-BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
+%endif
 
 %description
 Plexus Security Dispatcher Component
@@ -30,15 +30,20 @@ Plexus Security Dispatcher Component
 %{?javadoc_package}
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -n %{name}-%{name}-%{version}
 
 cp %{SOURCE1} .
 
+%pom_remove_parent
+
+%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
@@ -47,15 +52,52 @@ cp %{SOURCE1} .
 %license LICENSE-2.0.txt
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Oct 19 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.0-1
+- Update to version 2.0
+
+* 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
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.4-30
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-29
 - Build with OpenJDK 8
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-28
 - Mass rebuild for javapackages-tools 201902
 
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-27
 - Mass rebuild for javapackages-tools 201901
 
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 1.4-26
 - Include license file