.gitignore

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

.plexus-cipher.metadata

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

SPECS/plexus-cipher.spec

@@ -1,28 +1,26 @@
 %bcond_with bootstrap
 
 Name:           plexus-cipher
-Version:        1.7
+Version:        2.0
-Release:        28%{?dist}
+Release:        11%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
-License:        ASL 2.0
+License:        Apache-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
 
-# git clone https://github.com/sonatype/plexus-cipher.git
+Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-# 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
 %else
-BuildRequires:  mvn(javax.enterprise:cdi-api)
+BuildRequires:  maven-local
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
+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
 
 %description
@@ -31,27 +29,12 @@ Plexus Cipher: encryption/decryption Component
 %{?javadoc_package}
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
-
-%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 -f
+%mvn_build -- -DjavaVersion=8
 
 %install
 %mvn_install
@@ -60,21 +43,55 @@ Plexus Cipher: encryption/decryption Component
 %license LICENSE.txt NOTICE.txt
 
 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.7-28
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-11
-- Rebuild with regenerated Requires on Java
+- Switch Java compiler source/target to 1.8
+- Resolves: RHEL-52703
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.0-11
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0-10
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-7
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-6
+- Rebuild
+
+* Thu Aug 10 2023 Marian Koncek <mkoncek@redhat.com> - 2.0-5
+- Use implicit maven toolchains
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* 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
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-27
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.8-3
-- Rebuild to regenerate auto-requires
+- Rebuilt for java-17-openjdk as system jdk
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-26
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-25
+* Wed Aug 25 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1.8-1
-- Rebuild to workaround DistroBaker issue
+- Update to version 1.8
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-24
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-24
-- Bootstrap Maven for CentOS Stream 9
+- 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