From ca2c3aa252bc6a4804c186ba09114fd7a17d2ad1 Mon Sep 17 00:00:00 2001
From: Andrew Rouse <anrouse@uk.ibm.com>
Date: Fri, 14 Jun 2024 17:37:39 +0100
Subject: [PATCH] Depend on a single hamcrest version

Previously we were depending on two separate hamcrest jars and
restassured was bringing in a third.
---
 pom.xml     | 2 +-
 tck/pom.xml | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a6e2e1e..fb701d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <osgi-annotation.version>8.1.0</osgi-annotation.version>
         <!-- Versions of TCK dependencies -->
         <rest-assured.version>4.3.0</rest-assured.version>
-        <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
+        <hamcrest.version>2.1</hamcrest.version>
         <httpclient.version>4.5.2</httpclient.version>
         <jackson.version>2.10.1</jackson.version>
         <mp.rest-client-api.version>3.0.1</mp.rest-client-api.version>
diff --git a/tck/pom.xml b/tck/pom.xml
index f2e5dfbe..dd664bb3 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -94,13 +94,8 @@
 
          <dependency>
              <groupId>org.hamcrest</groupId>
-             <artifactId>hamcrest-all</artifactId>
-         </dependency>
-
-         <dependency>
-             <groupId>org.hamcrest</groupId>
-             <artifactId>java-hamcrest</artifactId>
-             <version>${java-hamcrest.version}</version>
+             <artifactId>hamcrest</artifactId>
+             <version>${hamcrest.version}</version>
          </dependency>
 
          <dependency>