Import rpm: a8fc1c34d1d856cfbe1fe52794dfda3e3850ad80
This commit is contained in:
James Antill
commit
21612bff74
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/maven-resolver-1.1.1-source-release.zip
|
||||
37
0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
Normal file
37
0001-Remove-use-of-deprecated-SHA-1-and-MD5-algorithms.patch
Normal file
@ -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
|
||||
|
||||
8
gating.yaml
Normal file
8
gating.yaml
Normal file
@ -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}
|
||||
231
maven-resolver.spec
Normal file
231
maven-resolver.spec
Normal file
@ -0,0 +1,231 @@
|
||||
Name: maven-resolver
|
||||
Epoch: 1
|
||||
Version: 1.1.1
|
||||
Release: 2%{?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
|
||||
BuildRequires: mvn(javax.inject:javax.inject)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
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:maven-parent:pom:)
|
||||
BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-classworlds)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
|
||||
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.slf4j:jcl-over-slf4j)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:)
|
||||
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether < 1:1.0.3
|
||||
|
||||
%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.
|
||||
|
||||
%package api
|
||||
Summary: Maven Artifact Resolver API
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-api < 1:1.0.3
|
||||
Obsoletes: aether-ant-tasks < 1:1.0.1-9
|
||||
|
||||
%description api
|
||||
The application programming interface for the repository system.
|
||||
|
||||
%package spi
|
||||
Summary: Maven Artifact Resolver SPI
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-spi < 1:1.0.3
|
||||
|
||||
%description spi
|
||||
The service provider interface for repository system implementations and
|
||||
repository connectors.
|
||||
|
||||
%package util
|
||||
Summary: Maven Artifact Resolver Utilities
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-util < 1:1.0.3
|
||||
|
||||
%description util
|
||||
A collection of utility classes to ease usage of the repository system.
|
||||
|
||||
%package impl
|
||||
Summary: Maven Artifact Resolver Implementation
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-impl < 1:1.0.3
|
||||
|
||||
%description impl
|
||||
An implementation of the repository system.
|
||||
|
||||
%package test-util
|
||||
Summary: Maven Artifact Resolver Test Utilities
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-test-util < 1:1.0.3
|
||||
|
||||
%description test-util
|
||||
A collection of utility classes to ease testing of the repository system.
|
||||
|
||||
%package connector-basic
|
||||
Summary: Maven Artifact Resolver Connector Basic
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-connector-basic < 1:1.0.3
|
||||
|
||||
%description connector-basic
|
||||
A repository connector implementation for repositories using URI-based layouts.
|
||||
|
||||
%package transport-classpath
|
||||
Summary: Maven Artifact Resolver Transport Classpath
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-transport-classpath < 1:1.0.3
|
||||
|
||||
%description transport-classpath
|
||||
A transport implementation for repositories using classpath:// URLs.
|
||||
|
||||
%package transport-file
|
||||
Summary: Maven Artifact Resolver Transport File
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-transport-file < 1:1.0.3
|
||||
|
||||
%description transport-file
|
||||
A transport implementation for repositories using file:// URLs.
|
||||
|
||||
%package transport-http
|
||||
Summary: Maven Artifact Resolver Transport HTTP
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-transport-http < 1:1.0.3
|
||||
|
||||
%description transport-http
|
||||
A transport implementation for repositories using http:// and https:// URLs.
|
||||
|
||||
%package transport-wagon
|
||||
Summary: Maven Artifact Resolver Transport Wagon
|
||||
# XXX Remove after F26 EOL
|
||||
Obsoletes: aether-transport-wagon < 1:1.0.3
|
||||
|
||||
%description transport-wagon
|
||||
A transport implementation based on Maven Wagon.
|
||||
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package provides %{summary}.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# tests require jetty 7
|
||||
%pom_remove_dep :::test maven-resolver-transport-http
|
||||
rm -r maven-resolver-transport-http/src/test
|
||||
|
||||
%pom_disable_module maven-resolver-demos
|
||||
|
||||
# generate OSGi manifests
|
||||
for pom in $(find -mindepth 2 -name pom.xml) ; do
|
||||
%pom_add_plugin "org.apache.felix:maven-bundle-plugin" $pom \
|
||||
"<configuration>
|
||||
<instructions>
|
||||
<Bundle-SymbolicName>\${project.groupId}$(sed 's:./maven-resolver::;s:/pom.xml::;s:-:.:g' <<< $pom)</Bundle-SymbolicName>
|
||||
<Export-Package>!org.eclipse.aether.internal*,org.eclipse.aether*</Export-Package>
|
||||
<_nouses>true</_nouses>
|
||||
</instructions>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>create-manifest</id>
|
||||
<phase>process-classes</phase>
|
||||
<goals><goal>manifest</goal></goals>
|
||||
</execution>
|
||||
</executions>"
|
||||
done
|
||||
%pom_add_plugin "org.apache.maven.plugins:maven-jar-plugin" pom.xml \
|
||||
"<configuration>
|
||||
<archive>
|
||||
<manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||
</archive>
|
||||
</configuration>"
|
||||
|
||||
%mvn_package :maven-resolver
|
||||
%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 -s
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files api -f .mfiles-%{name}-api
|
||||
%license LICENSE NOTICE
|
||||
%files spi -f .mfiles-%{name}-spi
|
||||
%files util -f .mfiles-%{name}-util
|
||||
%files impl -f .mfiles-%{name}-impl
|
||||
%files test-util -f .mfiles-%{name}-test-util
|
||||
%files connector-basic -f .mfiles-%{name}-connector-basic
|
||||
%files transport-classpath -f .mfiles-%{name}-transport-classpath
|
||||
%files transport-file -f .mfiles-%{name}-transport-file
|
||||
%files transport-http -f .mfiles-%{name}-transport-http
|
||||
%files transport-wagon -f .mfiles-%{name}-transport-wagon
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.1.1-2
|
||||
- Remove aether provides
|
||||
|
||||
* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 1:1.1.1-1
|
||||
- Update to upstream version 1.1.1
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Nov 27 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.1.0-2
|
||||
- Obsolete aether-ant-tasks
|
||||
- Resolves: rhbz#1516043
|
||||
|
||||
* Wed Oct 25 2017 Michael Simacek <msimacek@redhat.com> - 1:1.1.0-1
|
||||
- Update to upstream version 1.1.0
|
||||
|
||||
* Thu Aug 24 2017 Mat Booth <mat.booth@redhat.com> - 1:1.0.3-7
|
||||
- Fix OSGi metadata to also export "impl" packages; "internal" packages remain
|
||||
unexported
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed May 24 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.0.3-5
|
||||
- Add aether alias for main POM file
|
||||
|
||||
* Tue May 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.0.3-4
|
||||
- Fix duplicate Bundle-SymbolicName in OSGi manifests
|
||||
|
||||
* Mon May 15 2017 Mat Booth <mat.booth@redhat.com> - 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 <msimacek@redhat.com> - 1:1.0.3-2
|
||||
- Split into subpackages
|
||||
- Obsolete and provide aether
|
||||
|
||||
* Tue Apr 11 2017 Michael Simacek <msimacek@redhat.com> - 1.0.3-1
|
||||
- Initial packaging
|
||||
Loading…
Reference in New Issue
Block a user