From 984a96dbab0557aadacfb3ff75502f1f7c6a741d Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 25 Oct 2017 14:50:40 +0300 Subject: [PATCH] Update to upstream version 1.1.0 --- .gitignore | 1 + maven-resolver.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f845ace..81868f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /maven-resolver-1.0.3-source-release.zip +/maven-resolver-1.1.0-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 94e13fa..f3d466d 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -1,7 +1,7 @@ Name: maven-resolver Epoch: 1 -Version: 1.0.3 -Release: 7%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: http://maven.apache.org/resolver/ @@ -13,6 +13,7 @@ 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.codehaus.plexus:plexus-classworlds) @@ -22,7 +23,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) -BuildRequires: mvn(org.hamcrest:hamcrest-library) +BuildRequires: mvn(org.hamcrest:hamcrest-core) BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) @@ -126,6 +127,8 @@ This package provides %{summary}. %prep %setup -q +%pom_remove_plugin :maven-enforcer-plugin + # tests require jetty 7 %pom_remove_dep :::test maven-resolver-transport-http rm -r maven-resolver-transport-http/src/test @@ -185,6 +188,9 @@ done %license LICENSE NOTICE %changelog +* Wed Oct 25 2017 Michael Simacek - 1:1.1.0-1 +- Update to upstream version 1.1.0 + * Thu Aug 24 2017 Mat Booth - 1:1.0.3-7 - Fix OSGi metadata to also export "impl" packages; "internal" packages remain unexported diff --git a/sources b/sources index 085a693..6610d0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.0.3-source-release.zip) = 5bb23b480623eb2281cd4da2f9dcfe615330e9831e8e2abddd002b2da4f0885551a9a7de833200d29b9e835b379421af7b2761be6dd4b576fe5f2fc9c9271d6b +SHA512 (maven-resolver-1.1.0-source-release.zip) = abf797e691529e784578def74db038ce1f94e23d82f02b92719469927dc80fb6fbedb0dbef530e34b88eeabb3caaa31e6ea08ad97dfa24ef62b1e9f13ad3f9db