Accepting request 1176994 from Java:packages

plexus-container-default -> sisu-plexus

OBS-URL: https://build.opensuse.org/request/show/1176994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-shared-utils?expand=0&rev=7
This commit is contained in:
Ana Guerrero 2024-05-27 09:56:12 +00:00 committed by Git OBS Bridge
commit f0200f8ea8
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun May 26 22:42:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact in
order to avoid conflict/choise of providers
-------------------------------------------------------------------
Wed Feb 21 15:14:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -35,10 +35,9 @@ BuildRequires: jansi
BuildRequires: javapackages-local >= 6
BuildRequires: jsr-305
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildRequires: unzip
Requires: mvn(commons-io:commons-io)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
@ -68,10 +67,12 @@ cp %{SOURCE1} build.xml
%patch -P 0 -p1
%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 commons-io jansi/jansi jsr305 \
plexus/classworlds plexus-containers/plexus-container-default plexus/utils
org.eclipse.sisu.plexus plexus/classworlds plexus/utils
%if %{with tests}
build-jar-repository -s lib commons-lang3 maven/maven-artifact maven/maven-core \
maven/maven-model maven-plugin-testing/maven-plugin-testing-harness \