From 0092586dd9d14a0525821fa378d9cb18fea5c858 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Wed, 29 Nov 2023 12:46:35 +0300
Subject: [PATCH] Update hamcrest to v2.2

Due to changes in hamcrest packaging we only need the main artifact
now, but we add hamcrest-core (which is an empty pom) so it doesn't
get pulled in by other deps. Last, the hamcrest docs recommend that
we put hamcrest first so that we don't have dependency convergence
issues from junit.

See: https://hamcrest.org/JavaHamcrest/distributables
---
 dspace-api/pom.xml               |  2 +-
 dspace-oai/pom.xml               |  2 +-
 dspace-server-webapp/pom.xml     |  2 +-
 dspace/modules/additions/pom.xml |  2 +-
 pom.xml                          | 16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index ececf009851..f81341837b2 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -528,7 +528,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index b900ebe88de..db8b55c79b5 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -156,7 +156,7 @@
         <!-- As our Parent POM sets this to 'test' scope, we must override it -->
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 29457ff540b..05148dc73cc 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -498,7 +498,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index 922e0f0fe51..54d4dea25cd 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -273,7 +273,7 @@
       </dependency>
       <dependency>
          <groupId>org.hamcrest</groupId>
-         <artifactId>hamcrest-core</artifactId>
+         <artifactId>hamcrest</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index 1fe0dcde596..259bfe7754a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1661,21 +1661,21 @@
             </dependency>
             <!-- JUnit, Mockito and Hamcrest are used for Unit/Integration tests -->
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.13.2</version>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>2.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
+                <artifactId>hamcrest-core</artifactId>
+                <version>2.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-core</artifactId>
-                <version>1.3</version>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>