1
0

Accepting request 1174340 from Java:packages

build with sisu-plexus

OBS-URL: https://build.opensuse.org/request/show/1174340
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-bsh-factory?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2024-05-16 15:15:45 +00:00 committed by Git OBS Bridge
commit 9da3ddb4fa
3 changed files with 12 additions and 3 deletions

View File

@ -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: " +

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 16 04:58:40 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>

View File

@ -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