Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven4 for openSUSE:Factory checked in at 2026-08-26 19:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven4 (Old) and /work/SRC/openSUSE:Factory/.maven4.new.1258 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven4" Wed Aug 26 19:56:44 2026 rev:15 rq:1373815 version:4.0.0~rc6 Changes: -------- --- /work/SRC/openSUSE:Factory/maven4/maven4-bootstrap.changes 2026-08-05 17:50:10.457583938 +0200 +++ /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-bootstrap.changes 2026-08-26 19:56:52.249411083 +0200 @@ -1,0 +2,7 @@ +Tue Aug 25 13:06:25 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * 0003-Upgrade-to-maven-resolver-2.0.22.patch + + allow building with maven-resolver 2.0.22 + +------------------------------------------------------------------- maven4-testing.changes: same change maven4.changes: same change New: ---- 0003-Upgrade-to-maven-resolver-2.0.22.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-bootstrap.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-bootstrap.changes: * 0003-Upgrade-to-maven-resolver-2.0.22.patch /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-bootstrap.changes- + allow building with maven-resolver 2.0.22 -- /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-testing.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-testing.changes: * 0003-Upgrade-to-maven-resolver-2.0.22.patch /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4-testing.changes- + allow building with maven-resolver 2.0.22 -- /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4.changes: * 0003-Upgrade-to-maven-resolver-2.0.22.patch /work/SRC/openSUSE:Factory/.maven4.new.1258/maven4.changes- + allow building with maven-resolver 2.0.22 ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven4-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.082475820 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.086475961 +0200 @@ -34,6 +34,7 @@ Source10: apache-%{base_name}-build.tar.xz Patch1: 0001-Adapt-mvn-script.patch Patch2: 0002-Invoke-logback-via-reflection.patch +Patch3: 0003-Upgrade-to-maven-resolver-2.0.22.patch BuildRequires: ant BuildRequires: java-devel >= 17 BuildRequires: javapackages-local @@ -55,6 +56,7 @@ %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 %pom_remove_dep -r :junit-bom %pom_remove_dep -r :mockito-bom ++++++ maven4-testing.spec ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.144478010 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.146478081 +0200 @@ -34,6 +34,7 @@ Source10: apache-%{base_name}-build.tar.xz Patch1: 0001-Adapt-mvn-script.patch Patch2: 0002-Invoke-logback-via-reflection.patch +Patch3: 0003-Upgrade-to-maven-resolver-2.0.22.patch BuildRequires: ant BuildRequires: apiguardian BuildRequires: fdupes @@ -75,6 +76,7 @@ %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 ++++++ maven4.spec ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.198479917 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.203480094 +0200 @@ -37,7 +37,8 @@ Source100: pom_properties.py Patch1: 0001-Adapt-mvn-script.patch Patch2: 0002-Invoke-logback-via-reflection.patch -Patch3: jline-3.30.x.patch +Patch3: 0003-Upgrade-to-maven-resolver-2.0.22.patch +Patch10: jline-3.30.x.patch BuildRequires: ant BuildRequires: aopalliance BuildRequires: apache-commons-cli @@ -191,8 +192,9 @@ %patch -P 1 -p1 %patch -P 2 -p1 -%if %{?pkg_vcmp:%pkg_vcmp jline3-terminal < 4.1}%{!?pkg_vcmp:0} %patch -P 3 -p1 +%if %{?pkg_vcmp:%pkg_vcmp jline3-terminal < 4.1}%{!?pkg_vcmp:0} +%patch -P 10 -p1 %endif %pom_xpath_set pom:project/pom:properties/pom:plexusXmlVersion 4 ++++++ 0001-Adapt-mvn-script.patch ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.239481365 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.247481648 +0200 @@ -1,7 +1,7 @@ -From 4542cad616da2b77f199043fea9006b75540721d Mon Sep 17 00:00:00 2001 +From d0d97f837843465258454978e7bc58e0bdcb5661 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Wed, 1 Feb 2017 14:54:26 +0100 -Subject: [PATCH 1/2] Adapt mvn script +Subject: [PATCH 1/3] Adapt mvn script --- apache-maven/src/assembly/maven/bin/mvn | 15 +++++++++------ ++++++ 0002-Invoke-logback-via-reflection.patch ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.277482707 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.283482919 +0200 @@ -1,7 +1,7 @@ -From 3e9143e1d3b3606d118b8d358c2f74463d70a63a Mon Sep 17 00:00:00 2001 +From eee9fc50d39f6b5fe54a99f3ea53f109303a26d4 Mon Sep 17 00:00:00 2001 From: Michael Simacek <[email protected]> Date: Tue, 6 Jun 2017 13:47:43 +0200 -Subject: [PATCH 2/2] Invoke logback via reflection +Subject: [PATCH 2/3] Invoke logback via reflection --- .../logging/impl/LogbackConfiguration.java | 18 +++++++++++++----- ++++++ 0003-Upgrade-to-maven-resolver-2.0.22.patch ++++++ >From fef0b1a38d6ec8abc79dc5400d0f04f822e72978 Mon Sep 17 00:00:00 2001 From: Fridrich Strba <[email protected]> Date: Tue, 25 Aug 2026 11:17:12 +0200 Subject: [PATCH 3/3] Upgrade to maven-resolver 2.0.22 --- .../impl/standalone/RepositorySystemSupplier.java | 7 +++---- .../plugin/stubs/RepositorySystemSupplier.java | 11 +++++------ pom.xml | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java index df64ef0570..408ea4d394 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/standalone/RepositorySystemSupplier.java @@ -18,7 +18,6 @@ */ package org.apache.maven.impl.standalone; -import java.util.List; import java.util.Map; import org.apache.maven.api.annotations.Nullable; @@ -313,13 +312,13 @@ static PathProcessor newPathProcessor() { @Singleton @Provides - static List<ValidatorFactory> newValidatorFactories() { - return List.of(new MavenValidatorFactory()); + static Map<String, ValidatorFactory> newValidatorFactories() { + return Map.of("mavenValidatorFactory", new MavenValidatorFactory()); } @Singleton @Provides - static RepositorySystemValidator newRepositorySystemValidator(List<ValidatorFactory> validatorFactories) { + static RepositorySystemValidator newRepositorySystemValidator(Map<String, ValidatorFactory> validatorFactories) { return new DefaultRepositorySystemValidator(validatorFactories); } diff --git a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java index 504a92b545..88221836cd 100644 --- a/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java +++ b/impl/maven-testing/src/main/java/org/apache/maven/testing/plugin/stubs/RepositorySystemSupplier.java @@ -18,7 +18,6 @@ */ package org.apache.maven.testing.plugin.stubs; -import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -1195,9 +1194,9 @@ protected RepositorySystemValidator createRepositorySystemValidator() { return new DefaultRepositorySystemValidator(getValidatorFactories()); } - private List<ValidatorFactory> validatorFactories; + private Map<String, ValidatorFactory> validatorFactories; - public final List<ValidatorFactory> getValidatorFactories() { + public final Map<String, ValidatorFactory> getValidatorFactories() { checkClosed(); if (validatorFactories == null) { validatorFactories = createValidatorFactories(); @@ -1205,9 +1204,9 @@ public final List<ValidatorFactory> getValidatorFactories() { return validatorFactories; } - protected List<ValidatorFactory> createValidatorFactories() { - List<ValidatorFactory> result = new ArrayList<>(); - result.add(new MavenValidatorFactory()); + protected Map<String, ValidatorFactory> createValidatorFactories() { + Map<String, ValidatorFactory> result = new HashMap<>(); + result.put("mavenValidatorFactory", new MavenValidatorFactory()); return result; } diff --git a/pom.xml b/pom.xml index ea711e1718..7d3a084a80 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ under the License. <plexusInterpolationVersion>1.29</plexusInterpolationVersion> <plexusTestingVersion>2.1.0</plexusTestingVersion> <plexusXmlVersion>4.1.1</plexusXmlVersion> - <resolverVersion>2.0.21</resolverVersion> + <resolverVersion>2.0.22</resolverVersion> <securityDispatcherVersion>4.1.0</securityDispatcherVersion> <sisuVersion>1.1.0</sisuVersion> <slf4jVersion>2.0.18</slf4jVersion> -- 2.55.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.XmVwMI/_old 2026-08-26 19:56:54.383486451 +0200 +++ /var/tmp/diff_new_pack.XmVwMI/_new 2026-08-26 19:56:54.392486769 +0200 @@ -1,6 +1,6 @@ -mtime: 1785821624 -commit: fca76d34a0ca927d9f85e473b70613388d4ef4048a2f2f237cb52f65f889d521 +mtime: 1787663324 +commit: faec45c867980b293081b5dafb32d70e54ee2a366c8036f7b5bb711ad711f185 url: https://src.opensuse.org/java-packages/maven4 -revision: fca76d34a0ca927d9f85e473b70613388d4ef4048a2f2f237cb52f65f889d521 +revision: faec45c867980b293081b5dafb32d70e54ee2a366c8036f7b5bb711ad711f185 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-08-25 15:08:44.000000000 +0200 @@ -0,0 +1 @@ +.osc
