commit e9acdfb1d7398e40c80ede2f6cf4c1677b307981 Author: James Antill Date: Mon Feb 20 01:59:16 2023 -0500 Import rpm: 109d1513a2177078a4c0bcc53c484477b5212f7d diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d3606dd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-resolver-1.4.1-source-release.zip diff --git a/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch b/0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch new file mode 100644 index 0000000..db6a544 --- /dev/null +++ b/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/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d6b7694 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test + - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/maven-resolver.spec b/maven-resolver.spec new file mode 100644 index 0000000..5f61c10 --- /dev/null +++ b/maven-resolver.spec @@ -0,0 +1,145 @@ +Name: maven-resolver +Version: 1.4.1 +Release: 3%{?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 +BuildArch: noarch + +BuildRequires: maven-local-openjdk8 +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?module_prefix}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: %{?module_prefix}mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) + +%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. + +%{?module_package} +%{?javadoc_package} + +%prep +%setup -q + +%pom_disable_module maven-resolver-demos +%pom_disable_module maven-resolver-transport-classpath +%pom_disable_module maven-resolver-transport-file +%pom_disable_module maven-resolver-transport-http +%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_file ':maven-resolver{*}' %{name}/maven-resolver@1 aether/aether@1 + +%build +%mvn_build + +%install +%mvn_install + +%files -n %{?module_prefix}%{name} -f .mfiles +%license LICENSE NOTICE + +%changelog +* 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 + +* Wed Sep 11 2019 Marian Koncek - 1.4.1-1 +- Update to upstream version 1.4.1 + +* 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 + +* 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 diff --git a/sources b/sources new file mode 100644 index 0000000..03f1a99 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (maven-resolver-1.4.1-source-release.zip) = 689ff47a550ae9833804d2cd6d60b4f04591906d