Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven for openSUSE:Factory checked in at 2022-03-14 19:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven (Old) and /work/SRC/openSUSE:Factory/.maven.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven" Mon Mar 14 19:35:22 2022 rev:9 rq:961508 version:3.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/maven/maven.changes 2022-01-13 23:22:12.472077570 +0100 +++ /work/SRC/openSUSE:Factory/.maven.new.25692/maven.changes 2022-03-14 19:37:11.814135773 +0100 @@ -1,0 +2,8 @@ +Fri Mar 11 12:11:36 UTC 2022 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- New: ---- 0005-Port-to-maven-resolver-1.7.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven.spec ++++++ --- /var/tmp/diff_new_pack.T5N6qF/_old 2022-03-14 19:37:12.286136338 +0100 +++ /var/tmp/diff_new_pack.T5N6qF/_new 2022-03-14 19:37:12.290136344 +0100 @@ -46,6 +46,7 @@ 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: 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: 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 @@ %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 @@ 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 @@ 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 \ ++++++ 0005-Port-to-maven-resolver-1.7.2.patch ++++++ >From b23d2957440cb4ff06a289b4864f782794b45f52 Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> 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
