From 1793d670a7be81731ec3ec903326013dfb8b833a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/16] Expand conditionals --- maven-wagon.spec | 49 ------------------------------------------------ 1 file changed, 49 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index fe37e7e..245a194 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,5 +1,3 @@ -%bcond_without scm -%bcond_without ssh Name: maven-wagon Epoch: 0 @@ -13,21 +11,12 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip BuildRequires: maven-local -%if %{with ssh} -BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(com.jcraft:jsch.agentproxy.connector-factory) -BuildRequires: mvn(com.jcraft:jsch.agentproxy.jsch) -%endif BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -%if %{with scm} -BuildRequires: mvn(org.apache.maven.scm:maven-scm-api) -BuildRequires: mvn(org.apache.maven.scm:maven-scm-manager-plexus) -%endif BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -93,33 +82,7 @@ Summary: http-lightweight module for %{name} %description http-lightweight http-lightweight module for %{name}. -%if %{with scm} -%package scm -Summary: scm module for %{name} -%description scm -scm module for %{name}. -%endif - -%if %{with ssh} -%package ssh-external -Summary: ssh-external module for %{name} - -%description ssh-external -ssh-external module for %{name}. - -%package ssh-common -Summary: ssh-common module for %{name} - -%description ssh-common -ssh-common module for %{name}. - -%package ssh -Summary: ssh module for %{name} - -%description ssh -ssh module for %{name}. -%endif %package javadoc Summary: Javadoc for %{name} @@ -144,14 +107,10 @@ Javadoc for %{name}. # missing dependencies %pom_disable_module wagon-webdav-jackrabbit wagon-providers -%if %{without scm} %pom_disable_module wagon-scm wagon-providers -%endif -%if %{without ssh} %pom_disable_module wagon-ssh wagon-providers %pom_disable_module wagon-ssh-common wagon-providers %pom_disable_module wagon-ssh-external wagon-providers -%endif %build %mvn_file ":wagon-{*}" %{name}/@1 @@ -178,14 +137,6 @@ Javadoc for %{name}. %files http -f .mfiles-wagon-http %files http-shared -f .mfiles-wagon-http-shared %files http-lightweight -f .mfiles-wagon-http-lightweight -%if %{with scm} -%files scm -f .mfiles-wagon-scm -%endif -%if %{with ssh} -%files ssh-external -f .mfiles-wagon-ssh-external -%files ssh-common -f .mfiles-wagon-ssh-common -%files ssh -f .mfiles-wagon-ssh -%endif %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE DEPENDENCIES From 3c15e04b47281f85959daf368edef40b655d48bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 02/16] Remove Obsoletes --- maven-wagon.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index 245a194..aea3f9c 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -24,8 +24,6 @@ BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) -Obsoletes: %{name}-manual < %{epoch}:%{version}-%{release} -Obsoletes: %{name}-provider-test < %{epoch}:%{version}-%{release} %description Maven Wagon is a transport abstraction that is used in Maven's @@ -40,8 +38,6 @@ following providers: %package provider-api Summary: provider-api module for %{name} -Obsoletes: %{name} < 2.6-4 -Obsoletes: %{name}-webdav-jackrabbit < 2.9-2 %description provider-api provider-api module for %{name}. From 3d48be171774e80f9c486a43ba15bc15045d45f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 03/16] Remove explicit Epoch --- maven-wagon.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index aea3f9c..28c5937 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,5 @@ Name: maven-wagon -Epoch: 0 Version: 3.1.0 Release: 1%{?dist} Summary: Tools to manage artifacts and deployment From a5e769a94109c040bb9273507ec95922989cf846 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 27 Feb 2019 13:07:20 +0100 Subject: [PATCH 04/16] Update to upstream version 3.3.2 --- .gitignore | 1 + maven-wagon.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1de18e6..e65a318 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ wagon-1.0-source-release.zip /wagon-2.10-source-release.zip /wagon-3.0.0-source-release.zip /wagon-3.1.0-source-release.zip +/wagon-3.3.2-source-release.zip diff --git a/maven-wagon.spec b/maven-wagon.spec index 28c5937..f391af9 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon -Version: 3.1.0 +Version: 3.3.2 Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 @@ -137,6 +137,13 @@ Javadoc for %{name}. %doc LICENSE NOTICE DEPENDENCIES %changelog +* Wed Feb 27 2019 Marian Koncek - 0:3.3.2-1 +- Update to upstream version 3.3.2 +- Fixes: RHBZ #1674068 + +* Mon Oct 8 2018 Mikolaj Izdebski - 0:3.2.0-1 +- Update to upstream version 3.2.0 + * Wed Jun 27 2018 Michael Simacek - 0:3.1.0-1 - Update to upstream version 3.1.0 diff --git a/sources b/sources index a88db5c..4b743d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wagon-3.1.0-source-release.zip) = 40b472e0de2518a8331e7f57867d9de8bf6a9f4d4c9e9b590d760c8b5a29682cfa63d634cd980a5ce4dbe15354fc8d5ec1e3d24aa7ced37a89422d9a6398374c +SHA512 (wagon-3.3.2-source-release.zip) = 48505538ee4eec686dea90a45cb683624a16baf899c3f0372a09520dc7a2bac7c3b92d8caf569a4ad4a7efff1b617824125dc2d3a632ee4fafd5b963d0f9a5cb From 32e9e84fa79d2dbb9a288600ffd3233d74d52bd5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:19 +0200 Subject: [PATCH 05/16] Mass rebuild for javapackages-tools 201901 --- maven-wagon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index f391af9..935db12 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,7 +1,7 @@ Name: maven-wagon Version: 3.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -137,6 +137,9 @@ Javadoc for %{name}. %doc LICENSE NOTICE DEPENDENCIES %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.3.2-2 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 27 2019 Marian Koncek - 0:3.3.2-1 - Update to upstream version 3.3.2 - Fixes: RHBZ #1674068 From e58c922e3bd89c24907c42745c27b8e16a1e6b55 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:12:35 +0200 Subject: [PATCH 06/16] Use javadoc_package macro --- maven-wagon.spec | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index 935db12..38ad51f 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,4 +1,3 @@ - Name: maven-wagon Version: 3.3.2 Release: 2%{?dist} @@ -77,13 +76,7 @@ Summary: http-lightweight module for %{name} %description http-lightweight http-lightweight module for %{name}. - - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -Javadoc for %{name}. +%{?javadoc_package} %prep %setup -q -n wagon-%{version} @@ -118,14 +111,13 @@ Javadoc for %{name}. # Maven requires Wagon HTTP with classifier "shaded" %mvn_alias :wagon-http :::shaded: - %install %mvn_install %files -f .mfiles -%doc LICENSE NOTICE DEPENDENCIES +%license LICENSE NOTICE +%doc DEPENDENCIES %files provider-api -f .mfiles-wagon-provider-api -%dir %{_javadir}/%{name} %files providers -f .mfiles-wagon-providers %files file -f .mfiles-wagon-file %files ftp -f .mfiles-wagon-ftp @@ -133,9 +125,6 @@ Javadoc for %{name}. %files http-shared -f .mfiles-wagon-http-shared %files http-lightweight -f .mfiles-wagon-http-lightweight -%files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE DEPENDENCIES - %changelog * Fri May 24 2019 Mikolaj Izdebski - 3.3.2-2 - Mass rebuild for javapackages-tools 201901 From b16d6478e815f7f83757790df41e94bc26269932 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:23:04 +0200 Subject: [PATCH 07/16] Disable ftp and http-lightweight providers --- maven-wagon.spec | 72 ++++++++---------------------------------------- 1 file changed, 12 insertions(+), 60 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index 38ad51f..d6a5fb5 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon Version: 3.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -10,19 +10,16 @@ Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{ver BuildRequires: maven-local BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) - %description Maven Wagon is a transport abstraction that is used in Maven's artifact and repository handling code. Currently wagon has the @@ -34,48 +31,7 @@ following providers: * WebDAV * SCM (in progress) -%package provider-api -Summary: provider-api module for %{name} - -%description provider-api -provider-api module for %{name}. - -%package providers -Summary: providers module for %{name} - -%description providers -providers module for %{name} - -%package file -Summary: file module for %{name} - -%description file -file module for %{name}. - -%package ftp -Summary: ftp module for %{name} - -%description ftp -ftp module for %{name}. - -%package http -Summary: http module for %{name} - -%description http -http module for %{name}. - -%package http-shared -Summary: http-shared module for %{name} - -%description http-shared -http-shared module for %{name}. - -%package http-lightweight -Summary: http-lightweight module for %{name} - -%description http-lightweight -http-lightweight module for %{name}. - +%{?module_package} %{?javadoc_package} %prep @@ -87,26 +43,26 @@ http-lightweight module for %{name}. # disable tests, missing dependencies %pom_disable_module wagon-tcks -%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml +%pom_disable_module wagon-ssh-common-test wagon-providers %pom_disable_module wagon-provider-test %pom_remove_dep :wagon-provider-test %pom_remove_dep :wagon-provider-test wagon-providers # missing dependencies -%pom_disable_module wagon-webdav-jackrabbit wagon-providers - +%pom_disable_module wagon-ftp wagon-providers +%pom_disable_module wagon-http-lightweight wagon-providers %pom_disable_module wagon-scm wagon-providers %pom_disable_module wagon-ssh wagon-providers %pom_disable_module wagon-ssh-common wagon-providers %pom_disable_module wagon-ssh-external wagon-providers +%pom_disable_module wagon-webdav-jackrabbit wagon-providers -%build %mvn_file ":wagon-{*}" %{name}/@1 - %mvn_package ":wagon" +%build # tests are disabled because of missing dependencies -%mvn_build -f -s +%mvn_build -f # Maven requires Wagon HTTP with classifier "shaded" %mvn_alias :wagon-http :::shaded: @@ -114,18 +70,14 @@ http-lightweight module for %{name}. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE NOTICE %doc DEPENDENCIES -%files provider-api -f .mfiles-wagon-provider-api -%files providers -f .mfiles-wagon-providers -%files file -f .mfiles-wagon-file -%files ftp -f .mfiles-wagon-ftp -%files http -f .mfiles-wagon-http -%files http-shared -f .mfiles-wagon-http-shared -%files http-lightweight -f .mfiles-wagon-http-lightweight %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 3.3.2-3 +- Disable ftp and http-lightweight providers + * Fri May 24 2019 Mikolaj Izdebski - 3.3.2-2 - Mass rebuild for javapackages-tools 201901 From 91cff2ba0962c9059e657e2c1d8e26900086d742 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:25:37 +0200 Subject: [PATCH 08/16] Namespace buildrequires --- maven-wagon.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index d6a5fb5..b165294 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -9,16 +9,16 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip BuildRequires: maven-local -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.httpcomponents:httpclient) -BuildRequires: mvn(org.apache.httpcomponents:httpcore) +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.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.jsoup:jsoup) -BuildRequires: mvn(org.slf4j:jcl-over-slf4j) -BuildRequires: mvn(org.slf4j:slf4j-api) +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) %description Maven Wagon is a transport abstraction that is used in Maven's From fbdeac7444f104da4fb8e62c7f7bc3eee560ccdc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 10 Jul 2019 17:00:26 +0200 Subject: [PATCH 09/16] Update to upstream version 3.3.3 --- .gitignore | 1 + maven-wagon.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e65a318..bbd1731 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ wagon-1.0-source-release.zip /wagon-3.0.0-source-release.zip /wagon-3.1.0-source-release.zip /wagon-3.3.2-source-release.zip +/wagon-3.3.3-source-release.zip diff --git a/maven-wagon.spec b/maven-wagon.spec index b165294..ef140cc 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon -Version: 3.3.2 -Release: 3%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -13,7 +13,6 @@ 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.maven:maven-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) BuildRequires: %{?module_prefix}mvn(org.jsoup:jsoup) @@ -57,6 +56,8 @@ following providers: %pom_disable_module wagon-ssh-external wagon-providers %pom_disable_module wagon-webdav-jackrabbit wagon-providers +%pom_remove_plugin :maven-shade-plugin wagon-providers/wagon-http + %mvn_file ":wagon-{*}" %{name}/@1 %mvn_package ":wagon" @@ -75,6 +76,10 @@ following providers: %doc DEPENDENCIES %changelog +* Wed Jul 10 2019 Marian Koncek - 3.3.3-1 +- Update to upstream version 3.3.3 +- Remove dependency on maven-shade-plugin + * Fri Jun 28 2019 Mikolaj Izdebski - 3.3.2-3 - Disable ftp and http-lightweight providers diff --git a/sources b/sources index 4b743d9..f042910 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wagon-3.3.2-source-release.zip) = 48505538ee4eec686dea90a45cb683624a16baf899c3f0372a09520dc7a2bac7c3b92d8caf569a4ad4a7efff1b617824125dc2d3a632ee4fafd5b963d0f9a5cb +SHA512 (wagon-3.3.3-source-release.zip) = 3fae2bea760a03896df395cee1896aa4a02e031fdc86daaba781243cad9aefa1c1c99fc7daa95e04da0248e5aa7649511d08503807dad5fc92d80e25202c999e From 6a26a4db3be03467cc92f3cfd503b4795053a905 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 10/16] Mass rebuild for javapackages-tools 201902 --- maven-wagon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index ef140cc..dbc0bd5 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -76,6 +76,9 @@ following providers: %doc DEPENDENCIES %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.3-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Jul 10 2019 Marian Koncek - 3.3.3-1 - Update to upstream version 3.3.3 - Remove dependency on maven-shade-plugin From 5d8baf5237742a225a9172c19b82a8020acc1467 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 21 Nov 2019 08:48:38 +0100 Subject: [PATCH 11/16] Update to upstream version 3.3.4 --- .gitignore | 1 + maven-wagon.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bbd1731..c73b842 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ wagon-1.0-source-release.zip /wagon-3.1.0-source-release.zip /wagon-3.3.2-source-release.zip /wagon-3.3.3-source-release.zip +/wagon-3.3.4-source-release.zip diff --git a/maven-wagon.spec b/maven-wagon.spec index dbc0bd5..c0c008c 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.4 +Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -76,6 +76,9 @@ following providers: %doc DEPENDENCIES %changelog +* 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 diff --git a/sources b/sources index f042910..0ba5c5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wagon-3.3.3-source-release.zip) = 3fae2bea760a03896df395cee1896aa4a02e031fdc86daaba781243cad9aefa1c1c99fc7daa95e04da0248e5aa7649511d08503807dad5fc92d80e25202c999e +SHA512 (wagon-3.3.4-source-release.zip) = 1484d17bede842ed45ae3642ccb12f585489a95604fd100a4fddea05e39b0d0471a3d878c8252cc2a29fcdc4f3d2ec0dd25629842ea4443d7557e488b0f3c25f From a7710a54be0b480718f5b3a96258203f3e316f15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 12/16] Build with OpenJDK 8 --- maven-wagon.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index c0c008c..b855858 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,6 +1,6 @@ Name: maven-wagon Version: 3.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon @@ -8,7 +8,7 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpclient) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) @@ -76,6 +76,9 @@ following providers: %doc DEPENDENCIES %changelog +* 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 From 030ca2a0122ab22f9ff99ebda44fc4a2ebfbb6f9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 08:22:05 +0200 Subject: [PATCH 13/16] Update to upstream version 3.4.1 --- .gitignore | 1 + maven-wagon.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c73b842..c6d2ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ wagon-1.0-source-release.zip /wagon-3.3.2-source-release.zip /wagon-3.3.3-source-release.zip /wagon-3.3.4-source-release.zip +/wagon-3.4.1-source-release.zip diff --git a/maven-wagon.spec b/maven-wagon.spec index b855858..a8003cd 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,12 +1,12 @@ Name: maven-wagon -Version: 3.3.4 -Release: 2%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 -URL: http://maven.apache.org/wagon +URL: https://maven.apache.org/wagon BuildArch: 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 BuildRequires: maven-local-openjdk8 BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) @@ -76,6 +76,9 @@ following providers: %doc DEPENDENCIES %changelog +* Fri Sep 11 2020 Marian Koncek - 3.4.1-1 +- Update to upstream version 3.4.1 + * Sat Jan 25 2020 Mikolaj Izdebski - 3.3.4-2 - Build with OpenJDK 8 diff --git a/sources b/sources index 0ba5c5c..a5a6270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wagon-3.3.4-source-release.zip) = 1484d17bede842ed45ae3642ccb12f585489a95604fd100a4fddea05e39b0d0471a3d878c8252cc2a29fcdc4f3d2ec0dd25629842ea4443d7557e488b0f3c25f +SHA512 (wagon-3.4.1-source-release.zip) = 342d3ad88ba3535a0b6cafcfebd3f5b2e0fc6ac4022bebcea78a60703b0c611232e765ea87fb98ada0dc5daf1a9002e9bf7959571eebc4c974efda042246999c From 5dd2c797d3eaffc919c4a4de2308c66e6705c8e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 4 Dec 2020 12:52:07 +0100 Subject: [PATCH 14/16] Update to upstream version 3.4.2 --- .gitignore | 1 + maven-wagon.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6d2ad6..41a20dd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ wagon-1.0-source-release.zip /wagon-3.3.3-source-release.zip /wagon-3.3.4-source-release.zip /wagon-3.4.1-source-release.zip +/wagon-3.4.2-source-release.zip diff --git a/maven-wagon.spec b/maven-wagon.spec index a8003cd..477005e 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,5 +1,5 @@ Name: maven-wagon -Version: 3.4.1 +Version: 3.4.2 Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 @@ -76,6 +76,9 @@ following providers: %doc DEPENDENCIES %changelog +* 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 diff --git a/sources b/sources index a5a6270..84d10f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wagon-3.4.1-source-release.zip) = 342d3ad88ba3535a0b6cafcfebd3f5b2e0fc6ac4022bebcea78a60703b0c611232e765ea87fb98ada0dc5daf1a9002e9bf7959571eebc4c974efda042246999c +SHA512 (wagon-3.4.2-source-release.zip) = e8ca061696427cd9b78478a822c84cf7c2d7ffa6629a9d3fd988ec725d39dc4bd1abc77aa0197728bce15ac7466ec26fbd83625063f7a4cd0948075e700df569 From 85fa0ee16a38d85594fdb2a64add4614ea30e2f7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 15/16] Conditionalize buildrequires in bootstrap mode --- maven-wagon.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-wagon.spec b/maven-wagon.spec index 477005e..49e961a 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-wagon Version: 3.4.2 Release: 1%{?dist} @@ -9,6 +11,9 @@ BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpclient) BuildRequires: %{?module_prefix}mvn(org.apache.httpcomponents:httpcore) @@ -18,6 +23,7 @@ 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) +%endif %description Maven Wagon is a transport abstraction that is used in Maven's From 34aa231792304f00ca286dc5af95e517d4b330d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 16/16] Turn off bootstrap mode by default --- maven-wagon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-wagon.spec b/maven-wagon.spec index 49e961a..d62d27d 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-wagon Version: 3.4.2