From e94bf511b28be2a938d80d0849c3e540888920f2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 18 Aug 2023 09:33:11 +0200 Subject: [PATCH] Update to upstream version 1.9.15 --- .gitignore | 1 + maven-resolver.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ac04595..b61edfa 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /maven-resolver-1.6.1-source-release.zip /maven-resolver-1.7.3-source-release.zip /maven-resolver-1.9.7-source-release.zip +/maven-resolver-1.9.15-source-release.zip diff --git a/maven-resolver.spec b/maven-resolver.spec index 835b229..22fe022 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -2,8 +2,8 @@ Name: maven-resolver Epoch: 1 -Version: 1.9.7 -Release: 4%{?dist} +Version: 1.9.15 +Release: 1%{?dist} License: ASL 2.0 Summary: Apache Maven Artifact Resolver library URL: https://maven.apache.org/resolver/ @@ -18,18 +18,18 @@ Patch0: 0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(com.google.guava:failureaccess) -BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.google.inject:guice) +BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-lang3) 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.wagon:wagon-provider-api) +BuildRequires: mvn(org.apache.maven:maven-model-builder) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) +BuildRequires: mvn(org.apache.maven:maven-resolver-provider) BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) @@ -65,7 +65,8 @@ artifact transports and artifact resolution. %setup -q %patch0 -p1 -# requires internet connection +# Skip tests that equire internet connection +rm maven-resolver-supplier/src/test/java/org/eclipse/aether/supplier/RepositorySystemSupplierTest.java rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/{HttpServer,HttpTransporterTest}.java %pom_remove_dep org.eclipse.jetty: maven-resolver-transport-http @@ -118,6 +119,9 @@ done %license LICENSE NOTICE %changelog +* Fri Aug 18 2023 Mikolaj Izdebski - 1:1.9.15-1 +- Update to upstream version 1.9.15 + * Tue Aug 15 2023 Mikolaj Izdebski - 1:1.9.7-4 - Build with default JDK 17 diff --git a/sources b/sources index bed7228..94f037e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-resolver-1.9.7-source-release.zip) = 27c0cc47ce67d972fc98f4f2dc2555c0cf342b223ccfbd20bef76911e7b712aecaad2b36aaf16f215b96862ec9716e476a4a27f5a7698fb7ceac8df525305e98 +SHA512 (maven-resolver-1.9.15-source-release.zip) = 94567525457ce734252686f24b8c422b2808dd9ff65763b09da7a92214e1292c0b6458619cbd8a1e73047bb1e93cab3b035fcf8062725e6c37566dc6aed68994