From db2ae3e23349d2c5d7b58650ea4e30053a6732113dbae9a23b05bbccb4c30b8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 18 May 2024 09:16:10 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=34 --- junit5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5.spec b/junit5.spec index 8446fa6..e273580 100644 --- a/junit5.spec +++ b/junit5.spec @@ -62,7 +62,7 @@ Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/ju Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch Patch2: 0002-Add-missing-module-static-requires.patch Patch3: 0003-Bump-open-test-reporting-to-0.1.0-M2.patch -BuildRequires: apiguardian +BuildRequires: apiguardian >= 1.1.2 BuildRequires: fdupes BuildRequires: java-devel >= 9 BuildRequires: opentest4j From c095701344bf67416163855f402e1e8e67e5619e19f1434deb8124a6618079df Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 24 May 2024 05:34:16 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=35 --- junit5.changes | 5 +++++ junit5.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/junit5.changes b/junit5.changes index 90a1153..58e3541 100644 --- a/junit5.changes +++ b/junit5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 24 05:33:13 UTC 2024 - Fridrich Strba + +- Let junit5 require junit5-minimal to avoid conflict of providers + ------------------------------------------------------------------- Tue Apr 30 16:25:27 UTC 2024 - Fridrich Strba diff --git a/junit5.spec b/junit5.spec index e273580..58bdd75 100644 --- a/junit5.spec +++ b/junit5.spec @@ -89,6 +89,7 @@ BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.opentest4j.reporting:open-test-reporting-events) BuildRequires: mvn(org.opentest4j:opentest4j) +Requires: %{base_name}-minimal >= %{version} %endif %description