From 183701b3108ca9d80ec7c01e73f5c85c7b326b06 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 13 Mar 2025 14:06:42 +0000
Subject: [PATCH] import CS plexus-cipher-2.0-25.module_el9+1171+eb38a622
---
.gitignore | 2 +-
.plexus-cipher.metadata | 2 +-
SPECS/plexus-cipher.spec | 136 ++++++++++++++++++++++++++++++---------
3 files changed, 108 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
index cd06abe..a963dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/plexus-cipher-1.7.tar.gz
+SOURCES/plexus-cipher-2.0.tar.gz
diff --git a/.plexus-cipher.metadata b/.plexus-cipher.metadata
index 6eb407c..fa8e501 100644
--- a/.plexus-cipher.metadata
+++ b/.plexus-cipher.metadata
@@ -1 +1 @@
-1186264cc97813e2e857b40eaac67dca38ae6892 SOURCES/plexus-cipher-1.7.tar.gz
+5983f0a9eb0f4bc0dfc8177f0b29ab6c713b4981 SOURCES/plexus-cipher-2.0.tar.gz
diff --git a/SPECS/plexus-cipher.spec b/SPECS/plexus-cipher.spec
index a3585ca..8f653d0 100644
--- a/SPECS/plexus-cipher.spec
+++ b/SPECS/plexus-cipher.spec
@@ -1,67 +1,143 @@
+%bcond_with bootstrap
+
Name: plexus-cipher
-Version: 1.7
-Release: 17%{?dist}
+Version: 2.0
+Release: 25%{?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
-# 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
+Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-BuildRequires: maven-local-openjdk8
-BuildRequires: mvn(javax.enterprise:cdi-api)
+%if %{with bootstrap}
+BuildRequires: javapackages-bootstrap
+%else
+BuildRequires: maven-local
BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin)
-BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:)
+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
Plexus Cipher: encryption/decryption Component
-%{?module_package}
-%{?javadoc_package}
+%package javadoc
+Summary: API documentation for %{name}
+
+%description javadoc
+API documentation for %{name}.
%prep
-%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
-
+%autosetup -p1 -n %{name}-%{name}-%{version}
%mvn_file : plexus/%{name}
+%mvn_alias org.codehaus.plexus: org.sonatype.plexus:
%build
-%mvn_build -f
+%mvn_build -- -DjavaVersion=8
%install
%mvn_install
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
%license LICENSE.txt NOTICE.txt
+%files javadoc -f .mfiles-javadoc
+
%changelog
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-24
+- Update javapackages test plan to f42
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.0-11
+- Rebuilt for java-21-openjdk as system jdk
+
+* Tue Feb 20 2024 Marian Koncek <mkoncek@redhat.com> - 2.0-10
+- Update Java source/target to 1.8
+
+* 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
+
+* 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