From 137f6a5eb97c75c638a0e42a53d21a5a653ca1aa633944a5e8fd3414cc1c8a68 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 17:34:22 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-i18n?expand=0&rev=12 --- ...us-i18n-plexus-container-default-missing.patch | 15 --------------- plexus-i18n.spec | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 plexus-i18n-plexus-container-default-missing.patch diff --git a/plexus-i18n-plexus-container-default-missing.patch b/plexus-i18n-plexus-container-default-missing.patch deleted file mode 100644 index f8fda57..0000000 --- a/plexus-i18n-plexus-container-default-missing.patch +++ /dev/null @@ -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 @@ - plexus-utils - 1.4.5 - -+ -+ org.codehaus.plexus -+ plexus-container-default -+ 1.0-alpha-9-stable-1 -+ - - - diff --git a/plexus-i18n.spec b/plexus-i18n.spec index e6b0dbb..c15b4f1 100644 --- a/plexus-i18n.spec +++ b/plexus-i18n.spec @@ -34,13 +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 >= 6 -BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -67,13 +66,14 @@ Javadoc for %{name}. %setup -q -n %{name}-%{namedver} cp %{SOURCE1} build.xml %patch -P 0 -p1 -%patch -P 1 -p1 + +%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 + org.eclipse.sisu.plexus %if %{with tests} build-jar-repository -s lib \ guava/guava \ From d529a07226d6098b8dcf5a8101ea571a7d14f87c70c4a99ab997cbbe795323af Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 04:46:18 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-i18n?expand=0&rev=13 --- ...us-i18n-plexus-container-default-missing.patch | 15 +++++++++++++++ plexus-i18n.spec | 8 ++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 plexus-i18n-plexus-container-default-missing.patch diff --git a/plexus-i18n-plexus-container-default-missing.patch b/plexus-i18n-plexus-container-default-missing.patch new file mode 100644 index 0000000..f8fda57 --- /dev/null +++ b/plexus-i18n-plexus-container-default-missing.patch @@ -0,0 +1,15 @@ +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 @@ + plexus-utils + 1.4.5 + ++ ++ org.codehaus.plexus ++ plexus-container-default ++ 1.0-alpha-9-stable-1 ++ + + + diff --git a/plexus-i18n.spec b/plexus-i18n.spec index c15b4f1..e6b0dbb 100644 --- a/plexus-i18n.spec +++ b/plexus-i18n.spec @@ -34,12 +34,13 @@ 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 >= 6 +BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils -BuildRequires: sisu-plexus BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -66,14 +67,13 @@ Javadoc for %{name}. %setup -q -n %{name}-%{namedver} cp %{SOURCE1} build.xml %patch -P 0 -p1 - -%pom_add_dep org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 +%patch -P 1 -p1 %build mkdir -p lib build-jar-repository -s lib \ plexus/utils \ - org.eclipse.sisu.plexus + plexus-containers/plexus-container-default %if %{with tests} build-jar-repository -s lib \ guava/guava \ From 3f9f58f7e19cb9440af3a6d9831278a7ced761bb662d4f453e7e15aac40ae697 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 05:16:16 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-i18n?expand=0&rev=14 --- ...us-i18n-plexus-container-default-missing.patch | 15 --------------- plexus-i18n.changes | 8 ++++++++ plexus-i18n.spec | 8 ++++---- 3 files changed, 12 insertions(+), 19 deletions(-) delete mode 100644 plexus-i18n-plexus-container-default-missing.patch diff --git a/plexus-i18n-plexus-container-default-missing.patch b/plexus-i18n-plexus-container-default-missing.patch deleted file mode 100644 index f8fda57..0000000 --- a/plexus-i18n-plexus-container-default-missing.patch +++ /dev/null @@ -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 @@ - plexus-utils - 1.4.5 - -+ -+ org.codehaus.plexus -+ plexus-container-default -+ 1.0-alpha-9-stable-1 -+ - - - diff --git a/plexus-i18n.changes b/plexus-i18n.changes index b3f661c..391729e 100644 --- a/plexus-i18n.changes +++ b/plexus-i18n.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 16 05:15:26 UTC 2024 - Fridrich Strba + +- 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 diff --git a/plexus-i18n.spec b/plexus-i18n.spec index e6b0dbb..c15b4f1 100644 --- a/plexus-i18n.spec +++ b/plexus-i18n.spec @@ -34,13 +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 >= 6 -BuildRequires: plexus-containers-container-default BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -67,13 +66,14 @@ Javadoc for %{name}. %setup -q -n %{name}-%{namedver} cp %{SOURCE1} build.xml %patch -P 0 -p1 -%patch -P 1 -p1 + +%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 + org.eclipse.sisu.plexus %if %{with tests} build-jar-repository -s lib \ guava/guava \