SLFO-pool/plexus-bsh-factory
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main plexus-bsh-factory revision cdd72a6b9e921145cf9244eeb45a9078

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:55:38 +02:00
parent a40255afd8
commit b48c4d9831
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Migrate-to-plexus-containers-container-default.patch
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: " +

20
plexus-bsh-factory.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sun May 26 19:33:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use the org.eclipse.sisu:org.eclipse.sisu.plexus to avoid
conflict/choise of providers
-------------------------------------------------------------------
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>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Sun Mar 20 17:56:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>

21
plexus-bsh-factory.spec
View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package plexus-bsh-factory
#
# 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
@ -38,14 +38,10 @@ Patch2: 0001-Migrate-to-plexus-containers-container-default.patch
BuildRequires: ant
BuildRequires: bsh2
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: javapackages-local >= 6
BuildRequires: plexus-classworlds >= 2
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
Requires: mvn(bsh:bsh)
Requires: mvn(classworlds:classworlds)
Requires: mvn(org.codehaus.plexus:plexus-container-default)
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: sisu-plexus
BuildArch: noarch
%description
@ -61,16 +57,17 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
%patch1 -b .sav
%patch2 -p1
%patch -P 1 -b .sav
%patch -P 2 -p1
cp release-pom.xml pom.xml
cp %{SOURCE1} build.xml
cp -p %{SOURCE3} .
%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
%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
@ -80,7 +77,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{parent}
install -pm 0644 target/%{name}-%{namedversion}.jar %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{parent}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{parent}/%{subname}.pom
%add_maven_depmap %{parent}/%{subname}.pom %{parent}/%{subname}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}