Sync from SUSE:SLFO:Main maven-shared-io revision 5752395e9c8077e149078f1bad5e0db9

maven-shared-io.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun May 26 19:21:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Do not add PROVIDED dependency on plexus-container-default
+
+-------------------------------------------------------------------
+Thu May 16 05:18:49 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+
+-------------------------------------------------------------------
+Wed Feb 21 10:51:04 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Wed Sep  6 22:37:02 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

maven-shared-io.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-shared-io
 #
-# 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
@@ -33,8 +33,8 @@ BuildRequires:  javapackages-local >= 6
 BuildRequires:  maven-lib
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
+BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildArch:      noarch
 
@@ -51,9 +51,7 @@ API documentation for %{name}.
 %prep
 %setup -q
 cp %{SOURCE1} build.xml
-%patch0 -p1
+%patch -P 0 -p1
-
-%pom_add_dep org.codehaus.plexus:plexus-container-default::provided
 
 %build
 mkdir -p lib
@@ -64,8 +62,8 @@ build-jar-repository -s lib \
   maven/maven-plugin-api \
   maven-wagon/provider-api \
   maven-shared-utils/maven-shared-utils \
-  plexus/utils \
+  org.eclipse.sisu.plexus \
-  plexus-containers/plexus-container-default
+  plexus/utils
 
 # Some of the tests cannot run outside maven
 %{ant} \