From ddc74845c75c65cd1c220490332fb17d6bbed153131d4a6c67c509f0aaebab3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Fri, 10 Oct 2025 21:45:07 +0200 Subject: [PATCH] 2.0.13 --- maven-resolver-2.0.11-source-release.zip | 3 -- maven-resolver-2.0.13-source-release.zip | 3 ++ maven-resolver2-build.tar.xz | 4 +- maven-resolver2-supplier-mvn3.changes | 4 +- maven-resolver2-supplier-mvn3.spec | 41 +++++++++---------- maven-resolver2-supplier-mvn4.changes | 4 +- maven-resolver2-supplier-mvn4.spec | 51 ++++++++++++------------ maven-resolver2.changes | 4 +- maven-resolver2.spec | 27 +++++++------ 9 files changed, 73 insertions(+), 68 deletions(-) delete mode 100644 maven-resolver-2.0.11-source-release.zip create mode 100644 maven-resolver-2.0.13-source-release.zip diff --git a/maven-resolver-2.0.11-source-release.zip b/maven-resolver-2.0.11-source-release.zip deleted file mode 100644 index c99c233..0000000 --- a/maven-resolver-2.0.11-source-release.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cfda742a8251b5ebe222b4fafeca1efaef6fd21cf6c75a819fafe1b07d4ba33 -size 2092765 diff --git a/maven-resolver-2.0.13-source-release.zip b/maven-resolver-2.0.13-source-release.zip new file mode 100644 index 0000000..e547e4c --- /dev/null +++ b/maven-resolver-2.0.13-source-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4c932db26313d976c0d00aed18c3c8e0b18193b5571a862b0e7d0eb5ba33512 +size 2112343 diff --git a/maven-resolver2-build.tar.xz b/maven-resolver2-build.tar.xz index d62e5b1..946ab6c 100644 --- a/maven-resolver2-build.tar.xz +++ b/maven-resolver2-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352327db52ffcd0d67175121fada251902ef2fa374d90e5706209c328e1d69c6 -size 9592 +oid sha256:5737e6adc7a6484d0ff2dbc4d17c43dd0ab7cb866114f52498c495f43d8494e6 +size 9616 diff --git a/maven-resolver2-supplier-mvn3.changes b/maven-resolver2-supplier-mvn3.changes index bfce8b0..b3248cc 100644 --- a/maven-resolver2-supplier-mvn3.changes +++ b/maven-resolver2-supplier-mvn3.changes @@ -1,4 +1,4 @@ ------------------------------------------------------------------- -Wed Mar 12 13:27:44 UTC 2025 - Fridrich Strba +Fri Oct 10 18:45:46 UTC 2025 - Fridrich Strba -- Initial packaging with version 2.0.7 +- Initial packaging with version 2.0.13 diff --git a/maven-resolver2-supplier-mvn3.spec b/maven-resolver2-supplier-mvn3.spec index 3830e73..14b9142 100644 --- a/maven-resolver2-supplier-mvn3.spec +++ b/maven-resolver2-supplier-mvn3.spec @@ -17,25 +17,26 @@ %define base_name maven-resolver +%define version_suffix 2 %define fragment_name supplier-mvn3 %define _buildshell /bin/bash -Name: %{base_name}2-%{fragment_name} -Version: 2.0.11 +Name: %{base_name}%{version_suffix}-%{fragment_name} +Version: 2.0.13 Release: 0 Summary: Maven Artifact Resolver Instance Supplier Maven3 License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/resolver/ Source0: https://archive.apache.org/dist/maven/resolver/%{base_name}-%{version}-source-release.zip -Source1: %{base_name}2-build.tar.xz -BuildRequires: %{base_name}2-api -BuildRequires: %{base_name}2-connector-basic -BuildRequires: %{base_name}2-impl -BuildRequires: %{base_name}2-named-locks -BuildRequires: %{base_name}2-spi -BuildRequires: %{base_name}2-transport-apache -BuildRequires: %{base_name}2-transport-file -BuildRequires: %{base_name}2-util +Source1: %{base_name}%{version_suffix}-build.tar.xz +BuildRequires: %{base_name}%{version_suffix}-api +BuildRequires: %{base_name}%{version_suffix}-connector-basic +BuildRequires: %{base_name}%{version_suffix}-impl +BuildRequires: %{base_name}%{version_suffix}-named-locks +BuildRequires: %{base_name}%{version_suffix}-spi +BuildRequires: %{base_name}%{version_suffix}-transport-apache +BuildRequires: %{base_name}%{version_suffix}-transport-file +BuildRequires: %{base_name}%{version_suffix}-util BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 17 @@ -72,21 +73,21 @@ This package provides %{summary}. %{mvn_package} :%{base_name} __noinstall -%{mvn_file} :{*} %{base_name}2/@1 +%{mvn_file} :{*} %{base_name}/@1 %build mkdir -p lib build-jar-repository -s lib \ maven/maven-model-builder \ maven/maven-resolver-provider \ - maven-resolver2/maven-resolver-api-2.0.7 \ - maven-resolver2/maven-resolver-connector-basic-2.0.7 \ - maven-resolver2/maven-resolver-impl-2.0.7 \ - maven-resolver2/maven-resolver-named-locks-2.0.7 \ - maven-resolver2/maven-resolver-spi-2.0.7 \ - maven-resolver2/maven-resolver-transport-apache \ - maven-resolver2/maven-resolver-transport-file-2.0.7 \ - maven-resolver2/maven-resolver-util-2.0.7 + %{base_name}/maven-resolver-api-%{version_suffix} \ + %{base_name}/maven-resolver-connector-basic-%{version_suffix} \ + %{base_name}/maven-resolver-impl-%{version_suffix} \ + %{base_name}/maven-resolver-named-locks-%{version_suffix} \ + %{base_name}/maven-resolver-spi-%{version_suffix} \ + %{base_name}/maven-resolver-transport-apache \ + %{base_name}/maven-resolver-transport-file-%{version_suffix} \ + %{base_name}/maven-resolver-util-%{version_suffix} %{ant} -f %{base_name}-%{fragment_name} \ %if %{without tests} diff --git a/maven-resolver2-supplier-mvn4.changes b/maven-resolver2-supplier-mvn4.changes index bfce8b0..b3248cc 100644 --- a/maven-resolver2-supplier-mvn4.changes +++ b/maven-resolver2-supplier-mvn4.changes @@ -1,4 +1,4 @@ ------------------------------------------------------------------- -Wed Mar 12 13:27:44 UTC 2025 - Fridrich Strba +Fri Oct 10 18:45:46 UTC 2025 - Fridrich Strba -- Initial packaging with version 2.0.7 +- Initial packaging with version 2.0.13 diff --git a/maven-resolver2-supplier-mvn4.spec b/maven-resolver2-supplier-mvn4.spec index 17005e2..38c2b2a 100644 --- a/maven-resolver2-supplier-mvn4.spec +++ b/maven-resolver2-supplier-mvn4.spec @@ -17,25 +17,26 @@ %define base_name maven-resolver +%define version_suffix 2 %define fragment_name supplier-mvn4 %define _buildshell /bin/bash -Name: %{base_name}2-%{fragment_name} -Version: 2.0.11 +Name: %{base_name}%{version_suffix}-%{fragment_name} +Version: 2.0.13 Release: 0 -Summary: Maven Artifact Resolver Instance Supplier Maven3 +Summary: Maven Artifact Resolver Instance Supplier Maven4 License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/resolver/ Source0: https://archive.apache.org/dist/maven/resolver/%{base_name}-%{version}-source-release.zip -Source1: %{base_name}2-build.tar.xz -BuildRequires: %{base_name}2-api -BuildRequires: %{base_name}2-connector-basic -BuildRequires: %{base_name}2-impl -BuildRequires: %{base_name}2-named-locks -BuildRequires: %{base_name}2-spi -BuildRequires: %{base_name}2-transport-apache -BuildRequires: %{base_name}2-transport-file -BuildRequires: %{base_name}2-util +Source1: %{base_name}%{version_suffix}-build.tar.xz +BuildRequires: %{base_name}%{version_suffix}-api +BuildRequires: %{base_name}%{version_suffix}-connector-basic +BuildRequires: %{base_name}%{version_suffix}-impl +BuildRequires: %{base_name}%{version_suffix}-named-locks +BuildRequires: %{base_name}%{version_suffix}-spi +BuildRequires: %{base_name}%{version_suffix}-transport-apache +BuildRequires: %{base_name}%{version_suffix}-transport-file +BuildRequires: %{base_name}%{version_suffix}-util BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel >= 17 @@ -72,23 +73,23 @@ This package provides %{summary}. %{mvn_package} :%{base_name} __noinstall -%{mvn_file} :{*} %{base_name}2/@1 +%{mvn_file} :{*} %{base_name}/@1 %build mkdir -p lib build-jar-repository -s lib \ - maven4/maven-api-core-4 \ - maven4/maven-api-spi-4 \ - maven4/maven-model-builder-4 \ - maven4/maven-resolver-provider-4 \ - maven-resolver2/maven-resolver-api-2 \ - maven-resolver2/maven-resolver-connector-basic-2 \ - maven-resolver2/maven-resolver-impl-2 \ - maven-resolver2/maven-resolver-named-locks-2 \ - maven-resolver2/maven-resolver-spi-2 \ - maven-resolver2/maven-resolver-transport-apache \ - maven-resolver2/maven-resolver-transport-file-2 \ - maven-resolver2/maven-resolver-util-2 + maven/maven-api-core-4 \ + maven/maven-api-spi-4 \ + maven/maven-model-builder-4 \ + maven/maven-resolver-provider-4 \ + %{base_name}/maven-resolver-api-%{version_suffix} \ + %{base_name}/maven-resolver-connector-basic-%{version_suffix} \ + %{base_name}/maven-resolver-impl-%{version_suffix} \ + %{base_name}/maven-resolver-named-locks-%{version_suffix} \ + %{base_name}/maven-resolver-spi-%{version_suffix} \ + %{base_name}/maven-resolver-transport-apache \ + %{base_name}/maven-resolver-transport-file-%{version_suffix} \ + %{base_name}/maven-resolver-util-%{version_suffix} %{ant} -f %{base_name}-%{fragment_name} \ %if %{without tests} diff --git a/maven-resolver2.changes b/maven-resolver2.changes index bfce8b0..b3248cc 100644 --- a/maven-resolver2.changes +++ b/maven-resolver2.changes @@ -1,4 +1,4 @@ ------------------------------------------------------------------- -Wed Mar 12 13:27:44 UTC 2025 - Fridrich Strba +Fri Oct 10 18:45:46 UTC 2025 - Fridrich Strba -- Initial packaging with version 2.0.7 +- Initial packaging with version 2.0.13 diff --git a/maven-resolver2.spec b/maven-resolver2.spec index 183a2eb..49d95b4 100644 --- a/maven-resolver2.spec +++ b/maven-resolver2.spec @@ -17,9 +17,10 @@ %define base_name maven-resolver +%define version_suffix 2 %define _buildshell /bin/bash -Name: %{base_name}2 -Version: 2.0.11 +Name: %{base_name}%{version_suffix} +Version: 2.0.13 Release: 0 Summary: Apache Maven Artifact Resolver library License: Apache-2.0 @@ -186,16 +187,18 @@ This package provides %{summary}. # Use newer maven4 version %pom_xpath_set pom:project/pom:properties/pom:maven4Version 4 -%{mvn_compat_version} :maven-resolver-api 2 %{version} -%{mvn_compat_version} :maven-resolver-connector-basic 2 %{version} -%{mvn_compat_version} :maven-resolver-impl 2 %{version} -%{mvn_compat_version} :maven-resolver-named-locks 2 %{version} -%{mvn_compat_version} :maven-resolver-spi 2 %{version} -%{mvn_compat_version} :maven-resolver-test-util 2 %{version} -%{mvn_compat_version} :maven-resolver-transport-classpath 2 %{version} -%{mvn_compat_version} :maven-resolver-transport-file 2 %{version} -%{mvn_compat_version} :maven-resolver-transport-wagon 2 %{version} -%{mvn_compat_version} :maven-resolver-util 2 %{version} +%{mvn_file} :{*} %{base_name}/@1 + +%{mvn_compat_version} :maven-resolver-api %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-connector-basic %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-impl %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-named-locks %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-spi %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-test-util %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-transport-classpath %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-transport-file %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-transport-wagon %{version_suffix} %{version} +%{mvn_compat_version} :maven-resolver-util %{version_suffix} %{version} %{mvn_package} :%{base_name} __noinstall %{mvn_package} :%{base_name}-transport-jdk-parent __noinstall