.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,26 +1,28 @@
 %bcond_with bootstrap
 
 Name:           plexus-cipher
-Version:        2.0
+Version:        1.7
-Release:        4%{?dist}
+Release:        28%{?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
 
+BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap-openjdk8
+BuildRequires:  javapackages-bootstrap
 %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.sonatype.plugins:sisu-maven-plugin)
-BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
-BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 %endif
 
 %description
@@ -29,12 +31,27 @@ Plexus Cipher: encryption/decryption Component
 %{?javadoc_package}
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q
+
+%pom_remove_parent
+%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+
+# 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
@@ -43,30 +60,21 @@ Plexus Cipher: encryption/decryption Component
 %license LICENSE.txt NOTICE.txt
 
 %changelog
-* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 2.0-4
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.7-28
-- Rebuild to regenerate auto-requires
+- Rebuild with regenerated Requires on Java
 
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-3
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-27
 - Rebuild to regenerate auto-requires
 
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* 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
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-25
-- Update to version 1.8
+- Rebuild to workaround DistroBaker issue
 
-* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-24
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-24
-- Second attempt - Rebuilt for
+- Bootstrap Maven for CentOS Stream 9
-  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-23
 - Bootstrap build