From 7a7076f33511d791b4551a9b2c2bcf4da13db164 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 05:55:17 -0400 Subject: [PATCH] import maven-resolver-1.7.3-5.module+el9.1.0+16330+91eb0817 --- .gitignore | 1 + .maven-resolver.metadata | 1 + ...-deprecated-SHA-1-and-MD5-algorithms.patch | 37 +++ SPECS/maven-resolver.spec | 259 ++++++++++++++++++ 4 files changed, 298 insertions(+) create mode 100644 .gitignore create mode 100644 .maven-resolver.metadata create mode 100644 SOURCES/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch create mode 100644 SPECS/maven-resolver.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..876184b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-resolver-1.7.3-source-release.zip diff --git a/.maven-resolver.metadata b/.maven-resolver.metadata new file mode 100644 index 0000000..3b785c9 --- /dev/null +++ b/.maven-resolver.metadata @@ -0,0 +1 @@ +4c6b378f56fd1a39bc06024e7866dcdde31c64e7 SOURCES/maven-resolver-1.7.3-source-release.zip diff --git a/SOURCES/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch b/SOURCES/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch new file mode 100644 index 0000000..db6a544 --- /dev/null +++ b/SOURCES/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch @@ -0,0 +1,37 @@ +From 8f7d5c7c763f66035dda86012d58744547672abe Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/SPECS/maven-resolver.spec b/SPECS/maven-resolver.spec new file mode 100644 index 0000000..e3b59cf --- /dev/null +++ b/SPECS/maven-resolver.spec @@ -0,0 +1,259 @@ +%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: 5%{?dist} +License: ASL 2.0 +Summary: Apache Maven Artifact Resolver library +URL: https://maven.apache.org/resolver/ +BuildArch: noarch +ExclusiveArch: %{java_arches} 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 + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap-openjdk8 +%else +BuildRequires: maven-local-openjdk8 +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: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +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) +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: 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} +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} + +%description +Apache Maven Artifact Resolver is a library for working with artifact +repositories and dependency resolution. Maven Artifact Resolver deals with the +specification of local repository, remote repository, developer workspaces, +artifact transports and artifact resolution. + +%{?javadoc_package} + +%prep +%setup -q +%patch0 -p1 + +# requires internet connection +rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java + +%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_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 +for pom in $(find -mindepth 2 -name pom.xml) ; do + %pom_add_plugin "org.apache.felix:maven-bundle-plugin" $pom \ + " + + \${project.groupId}$(sed 's:./maven-resolver::;s:/pom.xml::;s:-:.:g' <<< $pom) + !org.eclipse.aether.internal*,org.eclipse.aether* + <_nouses>true + + + + + create-manifest + process-classes + manifest + + " +done +%pom_add_plugin "org.apache.maven.plugins:maven-jar-plugin" pom.xml \ +" + + \${project.build.outputDirectory}/META-INF/MANIFEST.MF + +" + +%mvn_alias 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1' +%mvn_alias 'org.apache.maven.resolver:maven-resolver-transport-wagon' 'org.eclipse.aether:aether-connector-wagon' +%mvn_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1:1.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 29 2022 Mikolaj Izdebski - 1:1.7.3-4 +- Add aether-connector-wagon alias + +* Sat Feb 05 2022 Jiri Vanek - 1:1.7.3-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 07 2022 Marian Koncek - 1:1.7.3-1 +- Update to upstream version 1.7.3 + +* Thu Oct 28 2021 Mikolaj Izdebski - 1:1.6.1-7 +- Remove use of deprecated SHA-1 and MD5 algorithms + +* Sun Oct 03 2021 Didik Supriadi - 1:1.6.1-6 +- Enable transport-file and transport-http module + +* Thu Jul 22 2021 Fedora Release Engineering - 1:1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 01 2021 Mikolaj Izdebski - 1:1.6.1-4 +- Add epoch to obsoleted packages + +* Tue Jun 01 2021 Mikolaj Izdebski - 1:1.6.1-3 +- Obsolete removed subpackages + +* Mon May 17 2021 Mikolaj Izdebski - 1:1.6.1-2 +- Bootstrap build +- Non-bootstrap build + +* Wed Feb 17 2021 Fabio Valentini - 1:1.4.2-5 +- Build with -release 8 for better OpenJDK 8 compatibility. + +* Tue Jan 26 2021 Fedora Release Engineering - 1:1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Marian Koncek - 1.6.1-1 +- Update to upstream version 1.6.1 + +* Tue Jul 28 2020 Fedora Release Engineering - 1:1.4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:1.4.2-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Marian Koncek - 1.4.2-1 +- Update to upstream version 1.4.2 + +* Sat May 09 2020 Fabio Valentini - 1:1.4.2-1 +- Update to version 1.4.2. + +* Wed Jan 29 2020 Fedora Release Engineering - 1:1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* 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 + +* Sun Nov 03 2019 Fabio Valentini - 1:1.4.1-1 +- Update to version 1.4.1. + +* Wed Sep 11 2019 Marian Koncek - 1.4.1-1 +- Update to upstream version 1.4.1 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* 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 + +* Tue May 14 2019 Mikolaj Izdebski - 1:1.3.3-1 +- Update to upstream version 1.3.3 + +* Fri Feb 01 2019 Fedora Release Engineering - 1:1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 23 2018 Marian Koncek - 1:1.3.1-1 +- Update to upstream version 1.3.1 + +* Fri Jul 13 2018 Fedora Release Engineering - 1:1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Apr 18 2018 Mikolaj Izdebski - 1:1.1.1-2 +- Remove aether provides + +* Mon Feb 26 2018 Michael Simacek - 1:1.1.1-1 +- Update to upstream version 1.1.1 + +* Thu Feb 08 2018 Fedora Release Engineering - 1:1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 27 2017 Mikolaj Izdebski - 1:1.1.0-2 +- Obsolete aether-ant-tasks +- Resolves: rhbz#1516043 + +* 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 + +* Wed Jul 26 2017 Fedora Release Engineering - 1:1.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed May 24 2017 Mikolaj Izdebski - 1:1.0.3-5 +- Add aether alias for main POM file + +* Tue May 23 2017 Mikolaj Izdebski - 1:1.0.3-4 +- Fix duplicate Bundle-SymbolicName in OSGi manifests + +* Mon May 15 2017 Mat Booth - 1:1.0.3-3 +- Restore OSGi metadata that was lost in the switch from "aether" to + "maven-resolver" + +* Wed Apr 12 2017 Michael Simacek - 1:1.0.3-2 +- Split into subpackages +- Obsolete and provide aether + +* Tue Apr 11 2017 Michael Simacek - 1.0.3-1 +- Initial packaging