Update to upstream version 1.9.7
This commit is contained in:
Mikolaj Izdebski
parent
c2064b62f6
commit
41e23273fc
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@
|
||||
/maven-resolver-1.4.2-source-release.zip
|
||||
/maven-resolver-1.6.1-source-release.zip
|
||||
/maven-resolver-1.7.3-source-release.zip
|
||||
/maven-resolver-1.9.7-source-release.zip
|
||||
|
||||
@ -1,37 +1,32 @@
|
||||
From 8f7d5c7c763f66035dda86012d58744547672abe Mon Sep 17 00:00:00 2001
|
||||
From b21684d4ce0ad83f1eb3553cfa5e8ccdd08bcdcd Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Thu, 28 Oct 2021 10:03:13 +0200
|
||||
Subject: [PATCH] Remove use of deprecated SHA-1 and MD5 algorithms
|
||||
|
||||
---
|
||||
.../aether/repository/AuthenticationDigest.java | 11 ++---------
|
||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
||||
.../eclipse/aether/repository/AuthenticationDigest.java | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
|
||||
index 27b88c02..6236e7b2 100644
|
||||
index ec95fcba..a9a57953 100644
|
||||
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
|
||||
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
|
||||
@@ -98,18 +98,11 @@ public final class AuthenticationDigest
|
||||
{
|
||||
try
|
||||
{
|
||||
- return MessageDigest.getInstance( "SHA-1" );
|
||||
+ return MessageDigest.getInstance( "SHA-256" );
|
||||
}
|
||||
catch ( NoSuchAlgorithmException e )
|
||||
{
|
||||
- try
|
||||
- {
|
||||
- return MessageDigest.getInstance( "MD5" );
|
||||
- }
|
||||
- catch ( NoSuchAlgorithmException ne )
|
||||
- {
|
||||
- throw new IllegalStateException( ne );
|
||||
- }
|
||||
+ throw new IllegalStateException( e );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,13 +88,9 @@ public final class AuthenticationDigest {
|
||||
|
||||
private static MessageDigest newDigest() {
|
||||
try {
|
||||
- return MessageDigest.getInstance("SHA-1");
|
||||
+ return MessageDigest.getInstance("SHA-256");
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
- try {
|
||||
- return MessageDigest.getInstance("MD5");
|
||||
- } catch (NoSuchAlgorithmException ne) {
|
||||
- throw new IllegalStateException(ne);
|
||||
- }
|
||||
+ throw new IllegalStateException(e);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.32.0
|
||||
2.39.2
|
||||
|
||||
|
||||
@ -1,15 +1,9 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
%if %{without bootstrap} && !0%{?rhel}
|
||||
%bcond_without maven_resolver_extra_modules
|
||||
%else
|
||||
%bcond_with maven_resolver_extra_modules
|
||||
%endif
|
||||
|
||||
Name: maven-resolver
|
||||
Epoch: 1
|
||||
Version: 1.7.3
|
||||
Release: 6%{?dist}
|
||||
Version: 1.9.7
|
||||
Release: 1%{?dist}
|
||||
License: ASL 2.0
|
||||
Summary: Apache Maven Artifact Resolver library
|
||||
URL: https://maven.apache.org/resolver/
|
||||
@ -24,11 +18,16 @@ Patch0: 0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
|
||||
BuildRequires: javapackages-bootstrap-openjdk8
|
||||
%else
|
||||
BuildRequires: maven-local-openjdk8
|
||||
BuildRequires: mvn(com.google.guava:failureaccess)
|
||||
BuildRequires: mvn(com.google.guava:guava)
|
||||
BuildRequires: mvn(com.google.inject:guice)
|
||||
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.maven.plugins:maven-enforcer-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-parent:pom:)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
||||
@ -36,17 +35,12 @@ 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)
|
||||
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:)
|
||||
%endif
|
||||
%if %{with maven_resolver_extra_modules}
|
||||
BuildRequires: mvn(javax.servlet:javax.servlet-api)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-http)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-server)
|
||||
BuildRequires: mvn(org.eclipse.jetty:jetty-util)
|
||||
%endif
|
||||
|
||||
Provides: maven-resolver-api = %{epoch}:%{version}-%{release}
|
||||
@ -72,20 +66,17 @@ artifact transports and artifact resolution.
|
||||
%patch0 -p1
|
||||
|
||||
# requires internet connection
|
||||
rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.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
|
||||
|
||||
%pom_remove_plugin -r :bnd-maven-plugin
|
||||
%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
|
||||
%pom_remove_plugin -r org.apache.maven.plugins:maven-enforcer-plugin
|
||||
%pom_remove_plugin -r :japicmp-maven-plugin
|
||||
|
||||
%pom_disable_module maven-resolver-demos
|
||||
%pom_disable_module maven-resolver-named-locks-hazelcast
|
||||
%pom_disable_module maven-resolver-named-locks-redisson
|
||||
%pom_disable_module maven-resolver-transport-classpath
|
||||
%if %{without maven_resolver_extra_modules}
|
||||
%pom_disable_module maven-resolver-transport-file
|
||||
%pom_disable_module maven-resolver-transport-http
|
||||
%endif
|
||||
%mvn_package :maven-resolver-test-util __noinstall
|
||||
|
||||
# generate OSGi manifests
|
||||
@ -127,6 +118,9 @@ done
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.9.7-1
|
||||
- Update to upstream version 1.9.7
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (maven-resolver-1.7.3-source-release.zip) = fb41a2cff0bf83f0e2e9a53f97fb4c8803c492b1d07ae5493e70101214b49db2b829850868adea06dc75436e6f0a023db31fef90dd1de8e9433210a87684db9b
|
||||
SHA512 (maven-resolver-1.9.7-source-release.zip) = 27c0cc47ce67d972fc98f4f2dc2555c0cf342b223ccfbd20bef76911e7b712aecaad2b36aaf16f215b96862ec9716e476a4a27f5a7698fb7ceac8df525305e98
|
||||
|
||||
Loading…
Reference in New Issue
Block a user