Sync from SUSE:SLFO:Main plexus-i18n revision 28b7073d5658d34bae697be1eae1bae4

plexus-i18n-plexus-container-default-missing.patch

@@ -1,15 +0,0 @@
-diff -Naur plexus-i18n-1.0-beta-10.orig/pom.xml plexus-i18n-1.0-beta-10/pom.xml
---- plexus-i18n-1.0-beta-10.orig/pom.xml	2012-03-06 15:41:05.000000000 +0100
-+++ plexus-i18n-1.0-beta-10/pom.xml	2012-03-06 15:54:20.383999743 +0100
-@@ -50,6 +50,11 @@
-       <artifactId>plexus-utils</artifactId>
-       <version>1.4.5</version>
-     </dependency>
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>1.0-alpha-9-stable-1</version>
-+    </dependency>
-   </dependencies>
- 
-   <scm>

plexus-i18n.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu May 16 05:15:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+- Removed patch:
+  * plexus-i18n-plexus-container-default-missing.patch
+    + not needed any more
+
+-------------------------------------------------------------------
+Tue Feb 20 14:55:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Sun Mar 20 18:02:02 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

plexus-i18n.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package plexus-i18n
 #
-# Copyright (c) 2022 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
@@ -34,15 +34,12 @@ URL:            https://github.com/codehaus-plexus/plexus-i18n
 Source0:        %{name}-%{namedver}-src.tar.bz2
 Source1:        %{name}-build.xml
 Patch0:         %{name}-migration-to-component-metadata.patch
-Patch1:         %{name}-plexus-container-default-missing.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
-BuildRequires:  plexus-containers-container-default
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
-Requires:       mvn(org.codehaus.plexus:plexus-container-default)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  sisu-plexus
 BuildArch:      noarch
 %if %{with tests}
 BuildRequires:  ant-junit
@@ -68,18 +65,22 @@ Javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{namedver}
 cp %{SOURCE1} build.xml
-%patch0 -p1
-%patch1 -p1
+%patch -P 0 -p1
 
-%pom_remove_parent .
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>" .
+%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus-containers/plexus-container-default
+build-jar-repository -s lib \
+    plexus/utils \
+    org.eclipse.sisu.plexus
 %if %{with tests}
-build-jar-repository -s lib guava/guava xbean/xbean-reflect plexus/classworlds
+build-jar-repository -s lib \
+    guava/guava \
+    xbean/xbean-reflect \
+    plexus/classworlds
 %endif
+
 %{ant} \
 %if %{without tests}
   -Dtest.skip=true \
@@ -92,7 +93,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/%{name}-%{namedver}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
 %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}