Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xmvn for openSUSE:Factory checked in at 2026-07-24 22:05:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmvn (Old) and /work/SRC/openSUSE:Factory/.xmvn.new.2004 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmvn" Fri Jul 24 22:05:30 2026 rev:27 rq:1367568 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xmvn/xmvn-connector.changes 2025-06-03 17:55:05.361462102 +0200 +++ /work/SRC/openSUSE:Factory/.xmvn.new.2004/xmvn-connector.changes 2026-07-24 22:05:42.138462722 +0200 @@ -1,0 +2,7 @@ +Fri Jul 17 08:59:24 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * 0001-Support-threaded-dependency-collection-in-maven-reso.patch + + Support threaded dependency collection in maven-resolver 2.x + +------------------------------------------------------------------- +++ only whitespace diff in changes, re-diffing xmvn-parent.changes: same change xmvn-tools.changes: same change xmvn.changes: same change New: ---- 0001-Support-threaded-dependency-collection-in-maven-reso.patch ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.xmvn.new.2004/xmvn-connector.changes-- Added patch: /work/SRC/openSUSE:Factory/.xmvn.new.2004/xmvn-connector.changes: * 0001-Support-threaded-dependency-collection-in-maven-reso.patch /work/SRC/openSUSE:Factory/.xmvn.new.2004/xmvn-connector.changes- + Support threaded dependency collection in maven-resolver 2.x ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmvn-connector.spec ++++++ --- /var/tmp/diff_new_pack.uWZ9cp/_old 2026-07-24 22:05:44.742553661 +0200 +++ /var/tmp/diff_new_pack.uWZ9cp/_new 2026-07-24 22:05:44.762554359 +0200 @@ -28,6 +28,7 @@ URL: https://fedora-java.github.io/xmvn/ Source0: https://github.com/fedora-java/%{parent}/releases/download/%{version}/%{parent}-%{version}.tar.xz Source1: %{parent}-build.tar.xz +Patch0: 0001-Support-threaded-dependency-collection-in-maven-reso.patch BuildRequires: %{parent}-api = %{version} BuildRequires: %{parent}-core = %{version} BuildRequires: ant xmvn-parent.spec: same change xmvn-tools.spec: same change xmvn.spec: same change ++++++ 0001-Support-threaded-dependency-collection-in-maven-reso.patch ++++++ >From 9320810116e42653d230da7a56e0f2855836c657 Mon Sep 17 00:00:00 2001 From: Fridrich Strba <[email protected]> Date: Fri, 17 Jul 2026 10:26:40 +0200 Subject: [PATCH] Support threaded dependency collection in maven-resolver 2.x Maven resolver 2.x introduces parallel dependency collection. This caused an issue for XMvn: non-thread-safe collections could crash with ConcurrentModificationExceptions. To fix this, standard collections have been replaced with thread-safe alternatives. Additionally, explicit sorting has been added to the dependency resolution lists to keep the build output deterministic. --- .../maven/DependencyVersionReportGenerator.java | 3 ++- .../connector/maven/XMvnMojoExecutionListener.java | 13 +++++++++++-- .../xmvn/connector/maven/XMvnWorkspaceReader.java | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/DependencyVersionReportGenerator.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/DependencyVersionReportGenerator.java index 76a94b47..6d4116c8 100644 --- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/DependencyVersionReportGenerator.java +++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/DependencyVersionReportGenerator.java @@ -15,6 +15,7 @@ */ package org.fedoraproject.xmvn.connector.maven; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -41,7 +42,7 @@ class DependencyVersionReportGenerator { private final Logger logger; - private final Map<Artifact, ResolutionResult> data = new LinkedHashMap<>(); + private final Map<Artifact, ResolutionResult> data = Collections.synchronizedMap( new LinkedHashMap<>() ); public DependencyVersionReportGenerator( Logger logger ) { diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java index 8b6726c1..61024960 100644 --- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java +++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnMojoExecutionListener.java @@ -26,8 +26,10 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Properties; +import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Named; @@ -140,7 +142,7 @@ public class XMvnMojoExecutionListener trySetBeanProperty( buildPluginManager, "mavenPluginManager", proxy ); } - private final List<String[]> resolutions = new ArrayList<>(); + private final List<String[]> resolutions = Collections.synchronizedList( new ArrayList<>() ); private static String getBeanProperty( Object bean, String... getterNames ) { @@ -291,7 +293,14 @@ public class XMvnMojoExecutionListener } else if ( XMVN_BUILDDEP.equals( execution ) ) { - trySetBeanProperty( mojo, "resolutions", Collections.unmodifiableList( new ArrayList<>( resolutions ) ) ); + List<String[]> sortedResolutions; + synchronized ( resolutions ) + { + sortedResolutions = resolutions.stream() + .sorted( Comparator.comparing( a -> a[0] ) ) + .collect( Collectors.toList() ); + } + trySetBeanProperty( mojo, "resolutions", Collections.unmodifiableList( sortedResolutions ) ); } } diff --git a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnWorkspaceReader.java b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnWorkspaceReader.java index 15a33a15..c640953f 100644 --- a/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnWorkspaceReader.java +++ b/xmvn-connector/src/main/java/org/fedoraproject/xmvn/connector/maven/XMvnWorkspaceReader.java @@ -20,6 +20,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; import javax.inject.Named; @@ -46,7 +47,7 @@ public class XMvnWorkspaceReader private static final WorkspaceRepository REPOSITORY = new WorkspaceRepository(); - private final List<ResolutionListener> listeners = new ArrayList<>(); + private final List<ResolutionListener> listeners = new CopyOnWriteArrayList<>(); public void addResolutionListener( ResolutionListener listener ) { -- 2.55.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.uWZ9cp/_old 2026-07-24 22:05:45.514580621 +0200 +++ /var/tmp/diff_new_pack.uWZ9cp/_new 2026-07-24 22:05:45.530581180 +0200 @@ -1,6 +1,6 @@ -mtime: 1778506576 -commit: e43e8758196c09b94f477017496cd137e7a80f0fe22406f7de5bd1b099a7a718 +mtime: 1784705953 +commit: 7c8994774f9f9aee2826198959c592df1f27fcd9f0cf8e43861c921e4370d4bd url: https://src.opensuse.org/java-packages/xmvn -revision: e43e8758196c09b94f477017496cd137e7a80f0fe22406f7de5bd1b099a7a718 +revision: 7c8994774f9f9aee2826198959c592df1f27fcd9f0cf8e43861c921e4370d4bd 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-07-22 09:39:13.000000000 +0200 @@ -0,0 +1 @@ +.osc
