Compare commits
No commits in common. "c8-stream-3.6" and "c9-beta" have entirely different histories.
c8-stream-
...
c9-beta
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/maven-resolver-1.4.1-source-release.zip
|
||||
SOURCES/maven-resolver-1.6.1-source-release.zip
|
||||
|
||||
@ -1 +1 @@
|
||||
689ff47a550ae9833804d2cd6d60b4f04591906d SOURCES/maven-resolver-1.4.1-source-release.zip
|
||||
9ea37ad1cdb9ade006af38929a64cecf88af19f9 SOURCES/maven-resolver-1.6.1-source-release.zip
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From 8f7d5c7c763f66035dda86012d58744547672abe 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(-)
|
||||
|
||||
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
|
||||
--- 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 );
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -1,18 +1,29 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: maven-resolver
|
||||
Version: 1.4.1
|
||||
Release: 3%{?dist}
|
||||
Epoch: 1
|
||||
Version: 1.6.1
|
||||
Release: 10%{?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/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: https://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
|
||||
|
||||
Patch0: 0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
|
||||
|
||||
BuildRequires: maven-local-openjdk8
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(javax.inject:javax.inject)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: 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.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)
|
||||
@ -20,9 +31,31 @@ 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: %{?module_prefix}mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
|
||||
%endif
|
||||
|
||||
Provides: maven-resolver-api = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-spi = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-impl = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-util = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-connector-basic = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-transport-wagon = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-transport-http = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-transport-file = %{epoch}:%{version}-%{release}
|
||||
Provides: maven-resolver-transport-classpath = %{epoch}:%{version}-%{release}
|
||||
|
||||
Obsoletes: maven-resolver-api < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-spi < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-impl < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-util < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-connector-basic < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-transport-wagon < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-transport-http < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-transport-file < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-transport-classpath < 1:1.4.2-6
|
||||
Obsoletes: maven-resolver-test-util < 1:1.4.2-6
|
||||
|
||||
%description
|
||||
Apache Maven Artifact Resolver is a library for working with artifact
|
||||
@ -30,13 +63,17 @@ 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
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%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
|
||||
@ -76,19 +113,78 @@ done
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-10
|
||||
- Rebuild to regenerate auto-requires
|
||||
|
||||
* Sun Nov 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-9
|
||||
- Rebuild with no changes
|
||||
|
||||
* Fri Nov 12 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-8
|
||||
- Remove use of deprecated SHA-1 and MD5 algorithms
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-7
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-6
|
||||
- Rebuild to workaround DistroBaker issue
|
||||
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-5
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-4
|
||||
- Add epoch to obsoleted packages
|
||||
|
||||
* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-3
|
||||
- Obsolete removed subpackages
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.6.1-2
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Wed Feb 17 2021 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.2-5
|
||||
- Build with -release 8 for better OpenJDK 8 compatibility.
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 15 2021 Marian Koncek <mkoncek@redhat.com> - 1.6.1-1
|
||||
- Update to upstream version 1.6.1
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:1.4.2-2
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Fri Jun 26 2020 Marian Koncek <mkoncek@redhat.com> - 1.4.2-1
|
||||
- Update to upstream version 1.4.2
|
||||
|
||||
* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.2-1
|
||||
- Update to version 1.4.2.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-3
|
||||
- Build with OpenJDK 8
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-2
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1:1.4.1-1
|
||||
- Update to version 1.4.1.
|
||||
|
||||
* Wed Sep 11 2019 Marian Koncek <mkoncek@redhat.com> - 1.4.1-1
|
||||
- Update to upstream version 1.4.1
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Jun 29 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.3.3-3
|
||||
- Disable unneeded transporters
|
||||
|
||||
@ -98,6 +194,9 @@ done
|
||||
* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.3.3-1
|
||||
- Update to upstream version 1.3.3
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Oct 23 2018 Marian Koncek <mkoncek@redhat.com> - 1:1.3.1-1
|
||||
- Update to upstream version 1.3.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user