From f2c3d50483987e4745c8e155e7c172f32770ca62 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:08:21 +0000 Subject: [PATCH] import CS plexus-sec-dispatcher-2.0-28.module_el9+1171+eb38a622 --- .gitignore | 2 +- .plexus-sec-dispatcher.metadata | 2 +- SOURCES/plexus-sec-dispatcher-pom.patch | 32 ------ SPECS/plexus-sec-dispatcher.spec | 124 +++++++++++++++++++----- 4 files changed, 104 insertions(+), 56 deletions(-) delete mode 100644 SOURCES/plexus-sec-dispatcher-pom.patch diff --git a/.gitignore b/.gitignore index 1b3e168..b9be142 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-sec-dispatcher-1.4.tar.bz2 +SOURCES/plexus-sec-dispatcher-2.0.tar.gz diff --git a/.plexus-sec-dispatcher.metadata b/.plexus-sec-dispatcher.metadata index dd63579..a8878a9 100644 --- a/.plexus-sec-dispatcher.metadata +++ b/.plexus-sec-dispatcher.metadata @@ -1 +1 @@ -a9459956c9e9ad24248c332e137c59fec894e1b7 SOURCES/plexus-sec-dispatcher-1.4.tar.bz2 +3932b05932194e4baf8703a7543f8d97ed7634ab SOURCES/plexus-sec-dispatcher-2.0.tar.gz diff --git a/SOURCES/plexus-sec-dispatcher-pom.patch b/SOURCES/plexus-sec-dispatcher-pom.patch deleted file mode 100644 index 9cdcb1c..0000000 --- a/SOURCES/plexus-sec-dispatcher-pom.patch +++ /dev/null @@ -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 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - 1.3.5 - - - -- descriptor -+ generate-metadata - - - - - -- maven-compiler-plugin -- -- -- 1.4 -- 1.4 -- -- -- - org.codehaus.modello - modello-maven-plugin - diff --git a/SPECS/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher.spec index d973c97..51822dd 100644 --- a/SPECS/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher.spec @@ -1,61 +1,141 @@ +%bcond_with bootstrap + Name: plexus-sec-dispatcher -Version: 1.4 -Release: 29%{?dist} +Version: 2.0 +Release: 28%{?dist} Summary: Plexus Security Dispatcher Component -License: ASL 2.0 +License: Apache-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 +Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz +Source1: https://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 - -BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local 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: %{?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:) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) +%endif %description Plexus Security Dispatcher Component -%{?module_package} -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 -n %{name}-%{name}-%{version} cp %{SOURCE1} . +%pom_remove_parent + +%pom_xpath_inject 'pom:project' 'org.codehaus.plexus' + %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 -%files -n %{?module_prefix}%{name} -f .mfiles +%files -f .mfiles %license LICENSE-2.0.txt +%files javadoc -f .mfiles-javadoc + %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 2.0-26 +- Update javapackages test plan to f42 + +* Fri Jul 19 2024 Fedora Release Engineering - 2.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 2.0-13 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.0-12 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 2.0-9 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.0-8 +- Convert License tag to SPDX format + +* Tue Aug 15 2023 Mikolaj Izdebski - 2.0-7 +- Build with default JDK 17 + +* Fri Jul 21 2023 Fedora Release Engineering - 2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Oct 19 2021 Didik Supriadi - 2.0-1 +- Update to version 2.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.4-33 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 1.4-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.4-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.4-30 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 1.4-29 - Build with OpenJDK 8 * Tue Nov 05 2019 Mikolaj Izdebski - 1.4-28 - Mass rebuild for javapackages-tools 201902 +* Fri Jul 26 2019 Fedora Release Engineering - 1.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1.4-27 - Mass rebuild for javapackages-tools 201901 +* Sat Feb 02 2019 Fedora Release Engineering - 1.4-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 31 2018 Michael Simacek - 1.4-26 - Include license file