From 03ba1a549def17e38d3bfa7e5105414c9a2fdf53 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 01/17] Remove Obsoletes --- maven-resolver.spec | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 88e41cb..56a0681 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -28,8 +28,6 @@ BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) -# XXX Remove after F26 EOL -Obsoletes: aether < 1:1.0.3 %description Apache Maven Artifact Resolver is a library for working with artifact @@ -39,17 +37,12 @@ artifact transports and artifact resolution. %package api Summary: Maven Artifact Resolver API -# XXX Remove after F26 EOL -Obsoletes: aether-api < 1:1.0.3 -Obsoletes: aether-ant-tasks < 1:1.0.1-9 %description api The application programming interface for the repository system. %package spi Summary: Maven Artifact Resolver SPI -# XXX Remove after F26 EOL -Obsoletes: aether-spi < 1:1.0.3 %description spi The service provider interface for repository system implementations and @@ -57,64 +50,48 @@ repository connectors. %package util Summary: Maven Artifact Resolver Utilities -# XXX Remove after F26 EOL -Obsoletes: aether-util < 1:1.0.3 %description util A collection of utility classes to ease usage of the repository system. %package impl Summary: Maven Artifact Resolver Implementation -# XXX Remove after F26 EOL -Obsoletes: aether-impl < 1:1.0.3 %description impl An implementation of the repository system. %package test-util Summary: Maven Artifact Resolver Test Utilities -# XXX Remove after F26 EOL -Obsoletes: aether-test-util < 1:1.0.3 %description test-util A collection of utility classes to ease testing of the repository system. %package connector-basic Summary: Maven Artifact Resolver Connector Basic -# XXX Remove after F26 EOL -Obsoletes: aether-connector-basic < 1:1.0.3 %description connector-basic A repository connector implementation for repositories using URI-based layouts. %package transport-classpath Summary: Maven Artifact Resolver Transport Classpath -# XXX Remove after F26 EOL -Obsoletes: aether-transport-classpath < 1:1.0.3 %description transport-classpath A transport implementation for repositories using classpath:// URLs. %package transport-file Summary: Maven Artifact Resolver Transport File -# XXX Remove after F26 EOL -Obsoletes: aether-transport-file < 1:1.0.3 %description transport-file A transport implementation for repositories using file:// URLs. %package transport-http Summary: Maven Artifact Resolver Transport HTTP -# XXX Remove after F26 EOL -Obsoletes: aether-transport-http < 1:1.0.3 %description transport-http A transport implementation for repositories using http:// and https:// URLs. %package transport-wagon Summary: Maven Artifact Resolver Transport Wagon -# XXX Remove after F26 EOL -Obsoletes: aether-transport-wagon < 1:1.0.3 %description transport-wagon A transport implementation based on Maven Wagon. From 69ed28bb32ca90f384fc36172c85af921454b075 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 May 2019 08:45:50 +0200 Subject: [PATCH 02/17] Update to upstream version 1.3.3 --- .gitignore | 1 + maven-resolver.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e1893f6..d0effc8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /maven-resolver-1.1.0-source-release.zip /maven-resolver-1.1.1-source-release.zip /maven-resolver-1.3.1-source-release.zip +/maven-resolver-1.3.3-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 55784c4..2534eae 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,6 +1,6 @@ Name: maven-resolver Epoch: 1 -Version: 1.3.1 +Version: 1.3.3 Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library @@ -166,6 +166,9 @@ done %license LICENSE NOTICE %changelog +* Tue May 14 2019 Mikolaj Izdebski - 1:1.3.3-1 +- Update to upstream version 1.3.3 + * Tue Oct 23 2018 Marian Koncek - 1:1.3.1-1 - Update to upstream version 1.3.1 diff --git a/sources b/sources index e58efef..cb249ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.3.1-source-release.zip) = 720b527130c6380cea988d9b2c664db1f31107b9abd2e8e08bc7296eeb38557994b3bbee9770f80a5211b350a660cb8e9173b4998867287602414eb9ae201828 +SHA512 (maven-resolver-1.3.3-source-release.zip) = d87a5257edf0feef813bd48d14c1bce3f64efbbed8d05df1e38d3cc9ca195f73932ac06751465c329bd1f22708d9743d9f34811ebe720266e090ca586ff8a3d3 From 8f7512b9eb8b16d1a7a5d696ca868fa2eb37c74f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:13 +0200 Subject: [PATCH 03/17] Mass rebuild for javapackages-tools 201901 --- maven-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 2534eae..01cc19d 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ Name: maven-resolver Epoch: 1 Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -166,6 +166,9 @@ done %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1:1.3.3-2 +- Mass rebuild for javapackages-tools 201901 + * Tue May 14 2019 Mikolaj Izdebski - 1:1.3.3-1 - Update to upstream version 1.3.3 From f762421f95e5918243358d12ffcd72b06e3ed5e8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 13:04:42 +0200 Subject: [PATCH 04/17] Disable unneeded transporters --- maven-resolver.spec | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 01cc19d..d2ce943 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ Name: maven-resolver Epoch: 1 Version: 1.3.3 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -12,10 +12,8 @@ BuildRequires: maven-local BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -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.wagon:wagon-provider-api) +BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) @@ -23,7 +21,6 @@ BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) @@ -59,36 +56,12 @@ Summary: Maven Artifact Resolver Implementation %description impl An implementation of the repository system. -%package test-util -Summary: Maven Artifact Resolver Test Utilities - -%description test-util -A collection of utility classes to ease testing of the repository system. - %package connector-basic Summary: Maven Artifact Resolver Connector Basic %description connector-basic A repository connector implementation for repositories using URI-based layouts. -%package transport-classpath -Summary: Maven Artifact Resolver Transport Classpath - -%description transport-classpath -A transport implementation for repositories using classpath:// URLs. - -%package transport-file -Summary: Maven Artifact Resolver Transport File - -%description transport-file -A transport implementation for repositories using file:// URLs. - -%package transport-http -Summary: Maven Artifact Resolver Transport HTTP - -%description transport-http -A transport implementation for repositories using http:// and https:// URLs. - %package transport-wagon Summary: Maven Artifact Resolver Transport Wagon @@ -110,6 +83,11 @@ This package provides %{summary}. rm -r maven-resolver-transport-http/src/test %pom_disable_module maven-resolver-demos +#%pom_disable_module maven-resolver-test-util +%pom_disable_module maven-resolver-transport-classpath +%pom_disable_module maven-resolver-transport-file +%pom_disable_module maven-resolver-transport-http +%mvn_package :maven-resolver-test-util __noinstall # generate OSGi manifests for pom in $(find -mindepth 2 -name pom.xml) ; do @@ -155,17 +133,16 @@ done %files spi -f .mfiles-%{name}-spi %files util -f .mfiles-%{name}-util %files impl -f .mfiles-%{name}-impl -%files test-util -f .mfiles-%{name}-test-util %files connector-basic -f .mfiles-%{name}-connector-basic -%files transport-classpath -f .mfiles-%{name}-transport-classpath -%files transport-file -f .mfiles-%{name}-transport-file -%files transport-http -f .mfiles-%{name}-transport-http %files transport-wagon -f .mfiles-%{name}-transport-wagon %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE %changelog +* Sat Jun 29 2019 Mikolaj Izdebski - 1:1.3.3-3 +- Disable unneeded transporters + * Fri May 24 2019 Mikolaj Izdebski - 1:1.3.3-2 - Mass rebuild for javapackages-tools 201901 From 82db25fe21eda6c4874271b4794cdac9a2f3c2f0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 13:08:01 +0200 Subject: [PATCH 05/17] Merge subpackages into the main package --- maven-resolver.spec | 55 +-------------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index d2ce943..edeb4a6 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -31,59 +31,16 @@ repositories and dependency resolution. Maven Artifact Resolver deals with the specification of local repository, remote repository, developer workspaces, artifact transports and artifact resolution. -%package api -Summary: Maven Artifact Resolver API - -%description api -The application programming interface for the repository system. - -%package spi -Summary: Maven Artifact Resolver SPI - -%description spi -The service provider interface for repository system implementations and -repository connectors. - -%package util -Summary: Maven Artifact Resolver Utilities - -%description util -A collection of utility classes to ease usage of the repository system. - -%package impl -Summary: Maven Artifact Resolver Implementation - -%description impl -An implementation of the repository system. - -%package connector-basic -Summary: Maven Artifact Resolver Connector Basic - -%description connector-basic -A repository connector implementation for repositories using URI-based layouts. - -%package transport-wagon -Summary: Maven Artifact Resolver Transport Wagon - -%description transport-wagon -A transport implementation based on Maven Wagon. - %package javadoc Summary: API documentation for %{name} %description javadoc This package provides %{summary}. - %prep %setup -q -# tests require jetty 7 -%pom_remove_dep :::test maven-resolver-transport-http -rm -r maven-resolver-transport-http/src/test - %pom_disable_module maven-resolver-demos -#%pom_disable_module maven-resolver-test-util %pom_disable_module maven-resolver-transport-classpath %pom_disable_module maven-resolver-transport-file %pom_disable_module maven-resolver-transport-http @@ -114,28 +71,18 @@ done " -%mvn_package :maven-resolver %mvn_alias 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1' %mvn_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1 %build -%mvn_build -s +%mvn_build %install %mvn_install - %files -f .mfiles %license LICENSE NOTICE -%files api -f .mfiles-%{name}-api -%license LICENSE NOTICE -%files spi -f .mfiles-%{name}-spi -%files util -f .mfiles-%{name}-util -%files impl -f .mfiles-%{name}-impl -%files connector-basic -f .mfiles-%{name}-connector-basic -%files transport-wagon -f .mfiles-%{name}-transport-wagon - %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE From 27cd1b1c140f965a42717a4019fb94d7782f8068 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 13:13:12 +0200 Subject: [PATCH 06/17] Use javadoc_package macro --- maven-resolver.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index edeb4a6..6e51de1 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -31,11 +31,7 @@ repositories and dependency resolution. Maven Artifact Resolver deals with the specification of local repository, remote repository, developer workspaces, artifact transports and artifact resolution. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -This package provides %{summary}. +%{?javadoc_package} %prep %setup -q @@ -83,9 +79,6 @@ done %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog * Sat Jun 29 2019 Mikolaj Izdebski - 1:1.3.3-3 - Disable unneeded transporters From a595f3eb5b8c994c6fef69b0953a195bb6caddf5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 13:14:07 +0200 Subject: [PATCH 07/17] Declare module package --- maven-resolver.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index 6e51de1..ade6ab7 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -31,6 +31,7 @@ repositories and dependency resolution. Maven Artifact Resolver deals with the specification of local repository, remote repository, developer workspaces, artifact transports and artifact resolution. +%{?module_package} %{?javadoc_package} %prep @@ -76,7 +77,7 @@ done %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE NOTICE %changelog From 756a334c937e28f2ca1324fb172336fe26ad2530 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 13:20:08 +0200 Subject: [PATCH 08/17] Namespace buildrequires --- maven-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index ade6ab7..89d840a 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -12,7 +12,7 @@ BuildRequires: maven-local BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) +BuildRequires: %{?module_prefix}mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) @@ -21,7 +21,7 @@ BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.mockito:mockito-core) -BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: %{?module_prefix}mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) From 4bb1d1e35c5a80b391edf38ed5b93c7985c3c797 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Sep 2019 15:33:06 +0200 Subject: [PATCH 09/17] Update to upstream version 1.4.1 --- .gitignore | 2 ++ maven-resolver.spec | 8 +++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d0effc8..4db989e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /maven-resolver-1.1.1-source-release.zip /maven-resolver-1.3.1-source-release.zip /maven-resolver-1.3.3-source-release.zip +/maven-resolver-1.4.0-source-release.zip +/maven-resolver-1.4.1-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 89d840a..ed57773 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,6 @@ Name: maven-resolver -Epoch: 1 -Version: 1.3.3 -Release: 3%{?dist} +Version: 1.4.1 +Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -81,6 +80,9 @@ done %license LICENSE NOTICE %changelog +* Wed Sep 11 2019 Marian Koncek - 1.4.1-1 +- Update to upstream version 1.4.1 + * Sat Jun 29 2019 Mikolaj Izdebski - 1:1.3.3-3 - Disable unneeded transporters diff --git a/sources b/sources index cb249ef..e711590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.3.3-source-release.zip) = d87a5257edf0feef813bd48d14c1bce3f64efbbed8d05df1e38d3cc9ca195f73932ac06751465c329bd1f22708d9743d9f34811ebe720266e090ca586ff8a3d3 +SHA512 (maven-resolver-1.4.1-source-release.zip) = e90430f551513603b40de8401fec66998959c5e1744ccd1241228dec062334f51eb4395ef2c0afd9550d092017bf5431cc69985e8c410bd7e1d46c77fb50ffb0 From b68491501346ec5d4f9de8540c22967f2cb138e9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 10/17] Mass rebuild for javapackages-tools 201902 --- maven-resolver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index ed57773..df4dde7 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,6 +1,6 @@ Name: maven-resolver Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -80,6 +80,9 @@ done %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4.1-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Sep 11 2019 Marian Koncek - 1.4.1-1 - Update to upstream version 1.4.1 From c573df067b15f420872df753dca8d30c4e0ed195 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 11/17] Build with OpenJDK 8 --- maven-resolver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index df4dde7..5f61c10 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,13 +1,13 @@ Name: maven-resolver Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ Source0: http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip BuildArch: noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -80,6 +80,9 @@ done %license LICENSE NOTICE %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4.1-3 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.4.1-2 - Mass rebuild for javapackages-tools 201902 From d56367aad295de192ef29812c692cf5e6f6b6e10 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 26 Jun 2020 16:32:19 +0200 Subject: [PATCH 12/17] Update to upstream version 1.4.2 --- .gitignore | 1 + maven-resolver.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4db989e..bd378af 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /maven-resolver-1.3.3-source-release.zip /maven-resolver-1.4.0-source-release.zip /maven-resolver-1.4.1-source-release.zip +/maven-resolver-1.4.2-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 5f61c10..bceb387 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,6 +1,6 @@ Name: maven-resolver -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -80,6 +80,9 @@ done %license LICENSE NOTICE %changelog +* Fri Jun 26 2020 Marian Koncek - 1.4.2-1 +- Update to upstream version 1.4.2 + * Sat Jan 25 2020 Mikolaj Izdebski - 1.4.1-3 - Build with OpenJDK 8 diff --git a/sources b/sources index e711590..4e25d98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.4.1-source-release.zip) = e90430f551513603b40de8401fec66998959c5e1744ccd1241228dec062334f51eb4395ef2c0afd9550d092017bf5431cc69985e8c410bd7e1d46c77fb50ffb0 +SHA512 (maven-resolver-1.4.2-source-release.zip) = 5d9513333da44e5d9b6097c8681a33f273ee78f797cdf7055be5cbf4d6c161e9e1e91a610b420201667a93ecc1f5c9a0a4a60fc1af2edfddb4c4e5d33f76ab40 From 4ef7d07b78bcb24fc9e2b35db2636f99c2b671d0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 26 Jun 2020 16:35:01 +0200 Subject: [PATCH 13/17] Use HTTPS --- maven-resolver.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index bceb387..7630944 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -3,8 +3,8 @@ Version: 1.4.2 Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library -URL: http://maven.apache.org/resolver/ -Source0: http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip +URL: https://maven.apache.org/resolver/ +Source0: https://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local-openjdk8 From 37d06d6c2bfabdae4a06ea27ea2724018645e4d9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 15 Jan 2021 15:45:26 +0100 Subject: [PATCH 14/17] Update to upstream version 1.6.1 --- .gitignore | 1 + maven-resolver.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bd378af..09473cf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /maven-resolver-1.4.0-source-release.zip /maven-resolver-1.4.1-source-release.zip /maven-resolver-1.4.2-source-release.zip +/maven-resolver-1.6.1-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 7630944..bc234a4 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,5 +1,5 @@ Name: maven-resolver -Version: 1.4.2 +Version: 1.6.1 Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library @@ -36,7 +36,11 @@ artifact transports and artifact resolution. %prep %setup -q +%pom_remove_plugin -r :bnd-maven-plugin + %pom_disable_module maven-resolver-demos +%pom_disable_module maven-resolver-synccontext-global +%pom_disable_module maven-resolver-synccontext-redisson %pom_disable_module maven-resolver-transport-classpath %pom_disable_module maven-resolver-transport-file %pom_disable_module maven-resolver-transport-http @@ -80,6 +84,9 @@ done %license LICENSE NOTICE %changelog +* Fri Jan 15 2021 Marian Koncek - 1.6.1-1 +- Update to upstream version 1.6.1 + * Fri Jun 26 2020 Marian Koncek - 1.4.2-1 - Update to upstream version 1.4.2 diff --git a/sources b/sources index 4e25d98..29d5dce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.4.2-source-release.zip) = 5d9513333da44e5d9b6097c8681a33f273ee78f797cdf7055be5cbf4d6c161e9e1e91a610b420201667a93ecc1f5c9a0a4a60fc1af2edfddb4c4e5d33f76ab40 +SHA512 (maven-resolver-1.6.1-source-release.zip) = ab45c772e9af4061977feb4fb48e3ae9ddd8cbebe41ada40f2a762504e96fd4c0fd4a939ab707667d9888caf92ab9fa354abe0624031c7049b7a2cb133421ddd From 8df299fa8fcb36c8d7a3ad0539e62949b8fd586f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Jan 2021 17:12:15 +0100 Subject: [PATCH 15/17] Add missing BuildRequires --- maven-resolver.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maven-resolver.spec b/maven-resolver.spec index bc234a4..9aeb6a9 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -10,9 +10,11 @@ BuildArch: noarch BuildRequires: maven-local-openjdk8 BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) +BuildRequires: %{?module_prefix}mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: %{?module_prefix}mvn(org.apache.maven.wagon:wagon-provider-api) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) From 23c59014530fd55b3af80cea805d06b51513fdb7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 16/17] Conditionalize buildrequires in bootstrap mode --- maven-resolver.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-resolver.spec b/maven-resolver.spec index 9aeb6a9..f563591 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-resolver Version: 1.6.1 Release: 1%{?dist} @@ -8,6 +10,9 @@ Source0: https://archive.apache.org/dist/maven/resolver/%{name}-%{version BuildArch: noarch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: %{?module_prefix}mvn(org.apache.commons:commons-lang3) @@ -25,6 +30,7 @@ BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: %{?module_prefix}mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) +%endif %description Apache Maven Artifact Resolver is a library for working with artifact From 7beea8a6a847e8e5becb1c4654a1232b8cfb9858 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 17/17] Turn off bootstrap mode by default --- maven-resolver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-resolver.spec b/maven-resolver.spec index f563591..83e5477 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-resolver Version: 1.6.1