From ef668c3dd7d6ec284fb1fd8aba01d414bd2386a7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 17 Mar 2025 15:05:32 +0000 Subject: [PATCH] import CS maven-wagon-3.5.3-17.module_el9+1180+96ab3331 --- .gitignore | 2 +- .maven-wagon.metadata | 2 +- SPECS/maven-wagon.spec | 164 ++++++++++++++++++++++++++++++++++++----- 3 files changed, 149 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index f93cd59..1556912 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/wagon-3.3.3-source-release.zip +SOURCES/wagon-3.5.3-source-release.zip diff --git a/.maven-wagon.metadata b/.maven-wagon.metadata index 9d66b2c..c948137 100644 --- a/.maven-wagon.metadata +++ b/.maven-wagon.metadata @@ -1 +1 @@ -30ff892e0895f3da0679de8224a20f39dafd53e5 SOURCES/wagon-3.3.3-source-release.zip +864cf366a3edb0ea081072b427b09cfbcf50995a SOURCES/wagon-3.5.3-source-release.zip diff --git a/SPECS/maven-wagon.spec b/SPECS/maven-wagon.spec index dbc0bd5..fed65b0 100644 --- a/SPECS/maven-wagon.spec +++ b/SPECS/maven-wagon.spec @@ -1,23 +1,33 @@ +%bcond_with bootstrap + Name: maven-wagon -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.5.3 +Release: 17%{?dist} Summary: Tools to manage artifacts and deployment -License: ASL 2.0 -URL: http://maven.apache.org/wagon +License: Apache-2.0 +URL: https://maven.apache.org/wagon BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip +Source0: https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) -BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpclient) -BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) +BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: %{?module_prefix}mvn(org.jsoup:jsoup) -BuildRequires: %{?module_prefix}mvn(org.slf4j:jcl-over-slf4j) -BuildRequires: %{?module_prefix}mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.slf4j:jcl-over-slf4j) +BuildRequires: mvn(org.slf4j:slf4j-api) +%endif +Provides: maven-wagon-file = %{version}-%{release} +Provides: maven-wagon-http = %{version}-%{release} +Provides: maven-wagon-http-shared = %{version}-%{release} +Provides: maven-wagon-provider-api = %{version}-%{release} +Provides: maven-wagon-providers = %{version}-%{release} %description Maven Wagon is a transport abstraction that is used in Maven's @@ -30,11 +40,14 @@ following providers: * WebDAV * SCM (in progress) -%{?module_package} -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -n wagon-%{version} +%autosetup -p1 -n wagon-%{version} %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin @@ -63,7 +76,7 @@ following providers: %build # tests are disabled because of missing dependencies -%mvn_build -f +%mvn_build -f -- -DjavaVersion=8 # Maven requires Wagon HTTP with classifier "shaded" %mvn_alias :wagon-http :::shaded: @@ -71,14 +84,122 @@ following providers: %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles +%files -f .mfiles %license LICENSE NOTICE %doc DEPENDENCIES +%files javadoc -f .mfiles-javadoc + %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 3.5.3-15 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 3.5.3-14 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 3.5.3-13 +- Set Java compiler source/target via javaVersion property + +* Thu Jul 18 2024 Fedora Release Engineering - 3.5.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.5.3-7 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 3.5.3-6 +- Update Java source/target to 1.8 + +* Thu Jan 25 2024 Fedora Release Engineering - 3.5.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 3.5.3-3 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.5.3-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Mikolaj Izdebski - 3.5.3-1 +- Update to upstream version 3.5.3 + +* Tue Aug 15 2023 Mikolaj Izdebski - 3.5.1-5 +- Build with default JDK 17 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 21 2022 Mikolaj Izdebski - 3.5.1-1 +- Update to upstream version 3.5.1 + +* Sat Feb 05 2022 Jiri Vanek - 3.4.2-6 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 01 2021 Mikolaj Izdebski - 3.4.2-3 +- Obsolete removed subpackages + +* Mon May 17 2021 Mikolaj Izdebski - 3.4.2-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Feb 02 2021 Fabio Valentini - 0:3.4.2-1 +- Update to version 3.4.2. + +* Tue Jan 26 2021 Fedora Release Engineering - 0:3.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Dec 4 2020 Mikolaj Izdebski - 3.4.2-1 +- Update to upstream version 3.4.2 + +* Fri Sep 11 2020 Marian Koncek - 3.4.1-1 +- Update to upstream version 3.4.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 0:3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:3.4.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 08 2020 Fabio Valentini - 0:3.4.1-1 +- Update to version 3.4.1. + +* Sat May 09 2020 Fabio Valentini - 0:3.4.0-1 +- Update to version 3.4.0. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:3.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 3.3.4-2 +- Build with OpenJDK 8 + +* Thu Nov 21 2019 Marian Koncek - 3.3.4-1 +- Update to upstream version 3.3.4 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.3.3-2 - Mass rebuild for javapackages-tools 201902 +* Sat Sep 14 2019 Miro Hrončok - 0:3.3.3-4 +- Obsolete maven-wagon-ssh properly (#1752165) + +* Thu Aug 29 2019 Fabio Valentini - 0:3.3.3-3 +- Disable SSH functionality. + +* Fri Jul 12 2019 Fabio Valentini - 0:3.3.3-2 +- Disable SCM leaf subpackage to fix FTBFS on 32bit architectures. + * Wed Jul 10 2019 Marian Koncek - 3.3.3-1 - Update to upstream version 3.3.3 - Remove dependency on maven-shade-plugin @@ -86,6 +207,9 @@ following providers: * Fri Jun 28 2019 Mikolaj Izdebski - 3.3.2-3 - Disable ftp and http-lightweight providers +* Thu Jun 27 2019 Fabio Valentini - 0:3.3.3-1 +- Update to version 3.3.3. + * Fri May 24 2019 Mikolaj Izdebski - 3.3.2-2 - Mass rebuild for javapackages-tools 201901 @@ -93,9 +217,15 @@ following providers: - Update to upstream version 3.3.2 - Fixes: RHBZ #1674068 +* Fri Feb 01 2019 Fedora Release Engineering - 0:3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Oct 8 2018 Mikolaj Izdebski - 0:3.2.0-1 - Update to upstream version 3.2.0 +* Fri Jul 13 2018 Fedora Release Engineering - 0:3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 27 2018 Michael Simacek - 0:3.1.0-1 - Update to upstream version 3.1.0