.gitignore

@@ -1 +1 @@
-SOURCES/plexus-cipher-2.0.tar.gz
+SOURCES/plexus-cipher-1.7.tar.gz

.plexus-cipher.metadata

@@ -1 +1 @@
-5983f0a9eb0f4bc0dfc8177f0b29ab6c713b4981 SOURCES/plexus-cipher-2.0.tar.gz
+1186264cc97813e2e857b40eaac67dca38ae6892 SOURCES/plexus-cipher-1.7.tar.gz

SPECS/plexus-cipher.spec

@@ -1,107 +1,67 @@
-%bcond_with bootstrap
-
 Name:           plexus-cipher
-Version:        2.0
-Release:        3%{?dist}
+Version:        1.7
+Release:        17%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
 License:        ASL 2.0
 # project moved to GitHub and it looks like there is no official website anymore
 URL:            https://github.com/codehaus-plexus/plexus-cipher
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+# git clone https://github.com/sonatype/plexus-cipher.git
+# cd plexus-cipher/
+# note this is version 1.7 + our patches which were incorporated by upstream maintainer
+# git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap-openjdk8
-%else
 BuildRequires:  maven-local-openjdk8
+BuildRequires:  mvn(javax.enterprise:cdi-api)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
-BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
-BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
-%endif
+BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
+BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
 
 %description
 Plexus Cipher: encryption/decryption Component
 
+%{?module_package}
 %{?javadoc_package}
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q
+
+# replace %{version}-SNAPSHOT with %{version}
+%pom_xpath_replace pom:project/pom:version "<version>%{version}</version>"
+
+# fedora moved from sonatype sisu to eclipse sisu. sisu-inject-bean artifact
+# doesn't exist in eclipse sisu. this artifact contains nothing but
+# bundled classes from atinject, cdi-api, aopalliance and maybe others.
+%pom_remove_dep org.sonatype.sisu:sisu-inject-bean
+%pom_add_dep javax.inject:javax.inject:1:provided
+%pom_add_dep javax.enterprise:cdi-api:1.0:provided
+
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
+
 %mvn_file : plexus/%{name}
-%mvn_alias org.codehaus.plexus: org.sonatype.plexus:
 
 %build
-%mvn_build
+%mvn_build -f
 
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license LICENSE.txt NOTICE.txt
 
 %changelog
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-3
-- Rebuild to regenerate auto-requires
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-1
-- Update to upstream version 2.0
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.8-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 25 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1.8-1
-- Update to version 1.8
-
-* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-24
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-23
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.7-20
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jun 25 2020 Alexander Kurtakov <akurtako@redhat.com> 1.7-19
-- Fix compile with Java 11.
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-17
 - Build with OpenJDK 8
 
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-16
 - Mass rebuild for javapackages-tools 201902
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-15
 - Mass rebuild for javapackages-tools 201901
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild