rpm/maven
SHA256
1
0
Fork 0
forked from pool/maven
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=35

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-11 12:12:45 +00:00 committed by Git OBS Bridge
parent 769ea5bc54
commit f6352cde41
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0005-Port-to-maven-resolver-1.7.2.patch Normal file
View File

@ -0,0 +1,25 @@
From b23d2957440cb4ff06a289b4864f782794b45f52 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 17 Dec 2021 13:05:49 +0100
Subject: [PATCH] Port to maven-resolver 1.7.2
---
.../org/apache/maven/repository/internal/MavenAetherModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
index 41e98aaea..d72e3c0f3 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
@@ -28,7 +28,7 @@
import org.apache.maven.model.building.DefaultModelBuilderFactory;
import org.apache.maven.model.building.ModelBuilder;
-import org.eclipse.aether.impl.AetherModule;
+import org.eclipse.aether.impl.guice.AetherModule;
import org.eclipse.aether.impl.ArtifactDescriptorReader;
import org.eclipse.aether.impl.MetadataGeneratorFactory;
import org.eclipse.aether.impl.VersionRangeResolver;
--
2.31.1

8
maven.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 11 12:11:36 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* 0005-Port-to-maven-resolver-1.7.2.patch
+ fix build with the API incompatible maven-resolver 1.7.3
- Link the new maven-resolver-named-locks artifact too
-------------------------------------------------------------------
Thu Jan 13 07:12:09 UTC 2022 - Fridrich Strba <fstrba@suse.com>

6
maven.spec
View File

@ -46,6 +46,7 @@ Patch1: 0001-Adapt-mvn-script.patch
Patch2: 0002-Invoke-logback-via-reflection.patch
Patch3: qdox-2.0.1.patch
Patch4: 0004-Use-non-shaded-HTTP-wagon.patch
Patch5: 0005-Port-to-maven-resolver-1.7.2.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
@ -69,6 +70,7 @@ BuildRequires: jdom2
BuildRequires: maven-resolver-api
BuildRequires: maven-resolver-connector-basic
BuildRequires: maven-resolver-impl
BuildRequires: maven-resolver-named-locks
BuildRequires: maven-resolver-spi
BuildRequires: maven-resolver-transport-wagon
BuildRequires: maven-resolver-util
@ -152,6 +154,7 @@ Requires: junit
Requires: maven-resolver-api
Requires: maven-resolver-connector-basic
Requires: maven-resolver-impl
Requires: maven-resolver-named-locks
Requires: maven-resolver-spi
Requires: maven-resolver-transport-wagon
Requires: maven-resolver-util
@ -200,6 +203,7 @@ BuildArch: noarch
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# not really used during build, but a precaution
find -name '*.jar' -not -path '*/test/*' -delete
@ -252,6 +256,7 @@ build-jar-repository -s lib \
jdom2/jdom2 \
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-impl \
maven-resolver/maven-resolver-named-locks \
maven-resolver/maven-resolver-spi \
maven-resolver/maven-resolver-util \
maven-shared-utils/maven-shared-utils \
@ -336,6 +341,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
maven-resolver/maven-resolver-api \
maven-resolver/maven-resolver-connector-basic \
maven-resolver/maven-resolver-impl \
maven-resolver/maven-resolver-named-locks \
maven-resolver/maven-resolver-spi \
maven-resolver/maven-resolver-transport-wagon \
maven-resolver/maven-resolver-util \