Accepting request 1176499 from Java:packages

Fix conflict of providers on some distributions

OBS-URL: https://build.opensuse.org/request/show/1176499
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eclipse-jgit?expand=0&rev=20

eclipse-jgit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Require hamcrest to avoid conflict of providers with hamcrest-core
+
 -------------------------------------------------------------------
 Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

eclipse-jgit.spec

@@ -50,7 +50,7 @@ BuildRequires:  ed25519-java
 BuildRequires:  fdupes
 BuildRequires:  git
 BuildRequires:  google-gson
-BuildRequires:  hamcrest-core
+BuildRequires:  hamcrest
 BuildRequires:  javaewah
 BuildRequires:  jgit = %{version}
 BuildRequires:  junit
@@ -74,7 +74,7 @@ Requires:       bouncycastle-pg
 Requires:       bouncycastle-pkix
 Requires:       ed25519-java
 Requires:       google-gson
-Requires:       hamcrest-core
+Requires:       hamcrest
 Requires:       javaewah
 Requires:       jgit = %{version}
 Requires:       junit

jgit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 23 14:19:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Require hamcrest to avoid conflict of providers with hamcrest-core
+
 -------------------------------------------------------------------
 Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba <fstrba@suse.com>