From 14f6e93a4b98ffb09a5a446dfdd88a72b603fcf1f96521aa5a60f611b1ae4c8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 18:15:35 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-bsh-factory?expand=0&rev=8 --- 0001-Migrate-to-plexus-containers-container-default.patch | 2 +- plexus-bsh-factory.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Migrate-to-plexus-containers-container-default.patch b/0001-Migrate-to-plexus-containers-container-default.patch index 5fe7ecc..266b90c 100644 --- a/0001-Migrate-to-plexus-containers-container-default.patch +++ b/0001-Migrate-to-plexus-containers-container-default.patch @@ -34,7 +34,7 @@ index f2f3437..5e39fcf 100644 + } + catch ( ComponentLookupException e ) + { -+ throw new ComponentInstantiationException( e ); ++ throw new ComponentInstantiationException( "", e ); + } + throw new ComponentInstantiationException( "Cannot build component for: " + diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec index e481661..b3790ba 100644 --- a/plexus-bsh-factory.spec +++ b/plexus-bsh-factory.spec @@ -40,8 +40,8 @@ BuildRequires: bsh2 BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: plexus-classworlds >= 2 -BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildArch: noarch %description @@ -66,7 +66,7 @@ cp -p %{SOURCE3} . %build mkdir -p lib -build-jar-repository -s lib plexus/classworlds plexus/utils plexus-containers/plexus-container-default bsh2/bsh +build-jar-repository -s lib plexus/classworlds plexus/utils org.eclipse.sisu.plexus bsh2/bsh %{ant} \ jar javadoc From 64ac3891497512fc98144bf5050ae53d444572b652d7d7f19ced187d84417c2a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 05:01:23 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-bsh-factory?expand=0&rev=9 --- plexus-bsh-factory.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plexus-bsh-factory.changes b/plexus-bsh-factory.changes index 50038b5..0a99d01 100644 --- a/plexus-bsh-factory.changes +++ b/plexus-bsh-factory.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 16 04:58:40 UTC 2024 - Fridrich Strba + +- Use sisu-plexus instead of plexus-containers-container-default +- Modified patch: + * 0001-Migrate-to-plexus-containers-container-default.patch + + fix to work with both plexus-containers-container-default + and sisu-plexus + ------------------------------------------------------------------- Tue Feb 20 14:42:08 UTC 2024 - Fridrich Strba