From 3b86dca905308ae43b06ed2ef3c47958610cc52580877b921c7e4e0e530e6b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 31 May 2024 14:49:37 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main maven-file-management revision
 5ecef433f52a38a6513dfcdfc548e777

---
 maven-file-management.changes | 11 +++++++++++
 maven-file-management.spec    | 20 ++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/maven-file-management.changes b/maven-file-management.changes
index 0039d9b..16b7539 100644
--- a/maven-file-management.changes
+++ b/maven-file-management.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu May 16 05:20:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+
+-------------------------------------------------------------------
+Tue Apr  2 17:25:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on plexus-xml where relevant
+  * this will be needed for smooth upgrade to plexus-utils 4.0.0
+
 -------------------------------------------------------------------
 Wed Sep  6 18:53:17 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-file-management.spec b/maven-file-management.spec
index 74e11f3..ce9875f 100644
--- a/maven-file-management.spec
+++ b/maven-file-management.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-file-management
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,8 +32,9 @@ BuildRequires:  maven-lib
 BuildRequires:  maven-shared-io
 BuildRequires:  maven-shared-utils
 BuildRequires:  modello >= 2.0.0
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
+BuildRequires:  plexus-xml
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildArch:      noarch
 
@@ -51,17 +52,20 @@ API documentation for %{name}.
 %setup -q -n file-management-%{version}
 cp %{SOURCE1} build.xml
 
+%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0
+
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-	maven/maven-plugin-api \
-	maven-shared-io/maven-shared-io \
-	maven-shared-utils/maven-shared-utils \
-	plexus-containers/plexus-container-default \
-	plexus/utils
+    maven/maven-plugin-api \
+    maven-shared-io/maven-shared-io \
+    maven-shared-utils/maven-shared-utils \
+    org.eclipse.sisu.plexus \
+    plexus/utils \
+    plexus/xml
 
 %{ant} \
-	jar javadoc
+    jar javadoc
 
 %install
 # jar