diff --git a/plexus-cli.changes b/plexus-cli.changes index d52634b..6d2e6f2 100644 --- a/plexus-cli.changes +++ b/plexus-cli.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 26 22:38:13 UTC 2024 - Fridrich Strba + +- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact to + avoid conflict/choise of providers + ------------------------------------------------------------------- Tue Feb 20 14:44:12 UTC 2024 - Fridrich Strba diff --git a/plexus-cli.spec b/plexus-cli.spec index d04c144..c31678b 100644 --- a/plexus-cli.spec +++ b/plexus-cli.spec @@ -34,8 +34,8 @@ BuildRequires: apache-commons-cli BuildRequires: fdupes BuildRequires: javapackages-local >= 6 BuildRequires: plexus-classworlds -BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: sisu-plexus BuildRequires: xz BuildArch: noarch %if %{with tests} @@ -64,10 +64,10 @@ Javadoc for %{name}. cp -p %{SOURCE1} . cp -p %{SOURCE100} build.xml -%pom_remove_parent +%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2 mkdir -p lib -build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default +build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds org.eclipse.sisu.plexus %if %{with tests} build-jar-repository -s lib guava/guava %endif