This commit is contained in:
parent
d99b470cc1
commit
03d4b001de
@ -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>
|
Wed Feb 21 15:14:20 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -35,10 +35,9 @@ BuildRequires: jansi
|
|||||||
BuildRequires: javapackages-local >= 6
|
BuildRequires: javapackages-local >= 6
|
||||||
BuildRequires: jsr-305
|
BuildRequires: jsr-305
|
||||||
BuildRequires: plexus-classworlds
|
BuildRequires: plexus-classworlds
|
||||||
BuildRequires: plexus-containers-container-default
|
|
||||||
BuildRequires: plexus-utils
|
BuildRequires: plexus-utils
|
||||||
|
BuildRequires: sisu-plexus
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
Requires: mvn(commons-io:commons-io)
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
@ -68,10 +67,12 @@ cp %{SOURCE1} build.xml
|
|||||||
|
|
||||||
%patch -P 0 -p1
|
%patch -P 0 -p1
|
||||||
|
|
||||||
|
%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
build-jar-repository -s lib commons-io jansi/jansi jsr305 \
|
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}
|
%if %{with tests}
|
||||||
build-jar-repository -s lib commons-lang3 maven/maven-artifact maven/maven-core \
|
build-jar-repository -s lib commons-lang3 maven/maven-artifact maven/maven-core \
|
||||||
maven/maven-model maven-plugin-testing/maven-plugin-testing-harness \
|
maven/maven-model maven-plugin-testing/maven-plugin-testing-harness \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user