From 1fd6afc0d708d5ad9869baebaafbae01a308ffb49956645e59f49c076791bb9c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 17:44:19 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=14 --- maven-shared-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index cc357ea..4c740cf 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -35,8 +35,8 @@ 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 @@ -71,7 +71,7 @@ cp %{SOURCE1} build.xml %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 \ From d99b470cc1dcf99ee9ece9e792aef281c881eb278a7236f195e8722c7b388766 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 04:48:23 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=15 --- maven-shared-utils.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 4c740cf..cc357ea 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -35,8 +35,8 @@ 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 @@ -71,7 +71,7 @@ cp %{SOURCE1} build.xml %build mkdir -p lib build-jar-repository -s lib commons-io jansi/jansi jsr305 \ - org.eclipse.sisu.plexus plexus/classworlds plexus/utils + plexus/classworlds plexus-containers/plexus-container-default 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 \ From 03d4b001de90e7c01f6e77fc069464abca25fc0c747eae1a7457ee724027f3f1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 26 May 2024 22:43:46 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=16 --- maven-shared-utils.changes | 6 ++++++ maven-shared-utils.spec | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/maven-shared-utils.changes b/maven-shared-utils.changes index 6b367d9..d35d138 100644 --- a/maven-shared-utils.changes +++ b/maven-shared-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 26 22:42:50 UTC 2024 - Fridrich Strba + +- 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 diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index cc357ea..8487b4d 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -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 \