From 097fca83b38956b887fd4f1e2cf33f4bafdea921 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Tue, 29 Aug 2023 12:55:18 +0200
Subject: Consolidate hamcrest usage to 2.x and remove cthul-matchers

---
 testutil/pom.xml                                              | 9 ++-------
 testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java | 4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'testutil')

diff --git a/testutil/pom.xml b/testutil/pom.xml
index f3bc9cb2212..7f57b6defee 100644
--- a/testutil/pom.xml
+++ b/testutil/pom.xml
@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
     <version>8-SNAPSHOT</version>
     <name>${project.artifactId}</name>
-    <description>Library of useful Hamcrest matchers.</description>
+    <description>Library of useful test utilities.</description>
     <dependencies>
         <dependency>
           <groupId>com.google.guava</groupId>
@@ -34,12 +34,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java b/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
index 855a0bc851e..c870c0b29b4 100644
--- a/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
+++ b/testutil/src/main/java/com/yahoo/test/LinePatternMatcher.java
@@ -3,7 +3,6 @@ package com.yahoo.test;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
 /**
@@ -35,8 +34,7 @@ public class LinePatternMatcher extends BaseMatcher<String> {
         return false;
     }
 
-    @Factory
-    public static <T> Matcher<String> containsLineWithPattern(String pattern) {
+    public static Matcher<String> containsLineWithPattern(String pattern) {
         return new LinePatternMatcher(pattern);
     }
 
-- 
cgit v1.2.3