You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/19 23:15:18 UTC

(maven-indexer) branch master updated: Drop Hamcrest from tests

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git


The following commit(s) were added to refs/heads/master by this push:
     new f8fba4e  Drop Hamcrest from tests
f8fba4e is described below

commit f8fba4e8f8c1c2ac212164a2ba3ff761edee01f7
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Sep 20 00:05:12 2026 +0200

    Drop Hamcrest from tests
---
 indexer-cli/pom.xml                                |  5 --
 indexer-core/pom.xml                               |  6 --
 .../maven/index/FullIndexNexusIndexerTest.java     |  6 +-
 .../maven/index/Mindexer35NexusIndexerTest.java    |  4 +-
 .../org/apache/maven/index/NexusIndexerTest.java   |  4 +-
 .../creator/OsgiArtifactIndexCreatorTest.java      |  4 +-
 indexer-examples/indexer-examples-basic/pom.xml    |  6 --
 indexer-examples/indexer-examples-spring/pom.xml   |  6 --
 indexer-reader/pom.xml                             |  5 --
 .../apache/maven/index/reader/ChunkReaderTest.java | 29 +++++-----
 .../apache/maven/index/reader/IndexReaderTest.java | 67 +++++++++++-----------
 .../apache/maven/index/reader/IndexWriterTest.java | 17 +++---
 .../org/apache/maven/index/reader/TestSupport.java |  7 +--
 .../apache/maven/index/reader/TransformTest.java   | 28 +++++----
 pom.xml                                            | 14 ++---
 search-api/pom.xml                                 |  6 --
 search-backend-indexer/pom.xml                     |  6 --
 search-backend-remoterepository/pom.xml            |  6 --
 .../RemoteRepositorySearchBackendImplTest.java     | 31 +++++-----
 search-backend-smo/pom.xml                         |  6 --
 20 files changed, 97 insertions(+), 166 deletions(-)

diff --git a/indexer-cli/pom.xml b/indexer-cli/pom.xml
index 05bc2e7..7b64bbe 100644
--- a/indexer-cli/pom.xml
+++ b/indexer-cli/pom.xml
@@ -77,11 +77,6 @@ under the License.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock</artifactId>
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 7278e49..9c1ed06 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -114,12 +114,6 @@ under the License.
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
index 097b2d4..ac845d0 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
@@ -48,8 +48,6 @@ import org.apache.maven.index.updater.IndexUpdater;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.lucene.search.BooleanClause.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -116,7 +114,7 @@ public class FullIndexNexusIndexerTest extends DefaultIndexNexusIndexerTest {
             GroupedSearchResponse response = nexusIndexer.searchGrouped(request);
 
             Map<String, ArtifactInfoGroup> r = response.getResults();
-            assertThat(r.toString(), r.size(), is(2));
+            assertEquals(2, r.size(), r.toString());
 
             Iterator<ArtifactInfoGroup> it = r.values().iterator();
 
@@ -494,7 +492,7 @@ public class FullIndexNexusIndexerTest extends DefaultIndexNexusIndexerTest {
             }
         }
 
-        assertThat(response.getTotalHitsCount(), is(5));
+        assertEquals(5, response.getTotalHitsCount());
 
         assertEquals(5, response.getTotalHits(), "found in jcl104-over-slf4j and commons-logging");
     }
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java
index a5057d2..58e1b91 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java
@@ -27,8 +27,6 @@ import org.apache.lucene.search.Query;
 import org.apache.maven.index.expr.UserInputSearchExpression;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Mindexer35NexusIndexerTest extends AbstractNexusIndexerTest {
@@ -49,7 +47,7 @@ public class Mindexer35NexusIndexerTest extends AbstractNexusIndexerTest {
 
         Collection<ArtifactInfo> r = response.getResults();
 
-        assertThat(r.size(), is(1));
+        assertEquals(1, r.size());
 
         List<ArtifactInfo> list = new ArrayList<>(r);
 
diff --git a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
index eaf07bb..f5ab55d 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java
@@ -57,8 +57,6 @@ import org.apache.maven.index.updater.IndexUpdater;
 import org.codehaus.plexus.util.StringUtils;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -84,7 +82,7 @@ public class NexusIndexerTest extends AbstractIndexCreatorHelper {
 
         // scored search against field having tokenized IndexerField only (should be impossible).
         q = indexer.constructQuery(MAVEN.NAME, "Some artifact name from Pom", SearchType.SCORED);
-        assertThat(q.toString(), is("(+n:some +n:artifact +n:name +n:from +n:Pom*) n:\"some artifact name from pom\""));
+        assertEquals("(+n:some +n:artifact +n:name +n:from +n:Pom*) n:\"some artifact name from pom\"", q.toString());
     }
 
     @Test
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
index e171d65..61d0f5b 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
@@ -38,8 +38,6 @@ import org.codehaus.plexus.util.FileUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -342,7 +340,7 @@ public class OsgiArtifactIndexCreatorTest extends AbstractTestSupport {
             FlatSearchResponse response = nexusIndexer.searchFlat(request);
 
             // System.out.println("results with export package query " + response.getResults() );
-            assertThat(response.getResults().size(), is(1));
+            assertEquals(1, response.getResults().size());
 
             ArtifactInfo ai = response.getResults().iterator().next();
             // System.out.println( "ai " + ai );
diff --git a/indexer-examples/indexer-examples-basic/pom.xml b/indexer-examples/indexer-examples-basic/pom.xml
index 8daceaa..c2246ed 100644
--- a/indexer-examples/indexer-examples-basic/pom.xml
+++ b/indexer-examples/indexer-examples-basic/pom.xml
@@ -70,12 +70,6 @@ under the License.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/indexer-examples/indexer-examples-spring/pom.xml b/indexer-examples/indexer-examples-spring/pom.xml
index bc8cb45..6cd3de2 100644
--- a/indexer-examples/indexer-examples-spring/pom.xml
+++ b/indexer-examples/indexer-examples-spring/pom.xml
@@ -112,12 +112,6 @@ under the License.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/indexer-reader/pom.xml b/indexer-reader/pom.xml
index c6c50d7..4353bf0 100644
--- a/indexer-reader/pom.xml
+++ b/indexer-reader/pom.xml
@@ -42,11 +42,6 @@ under the License.
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock</artifactId>
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
index 41d9aad..e6d8c9a 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/ChunkReaderTest.java
@@ -28,9 +28,8 @@ import java.util.Map;
 import org.apache.maven.index.reader.Record.Type;
 import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * UT for {@link ChunkReader}
@@ -43,11 +42,11 @@ public class ChunkReaderTest extends TestSupport {
                         "full",
                         handler.locate("nexus-maven-repository-index.gz").read())) {
             final Map<Type, List<Record>> recordTypes = loadRecordsByType(chunkReader);
-            assertThat(recordTypes.get(Type.DESCRIPTOR).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ROOT_GROUPS).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ALL_GROUPS).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ARTIFACT_ADD).size(), equalTo(2));
-            assertThat(recordTypes.get(Type.ARTIFACT_REMOVE), nullValue());
+            assertEquals(1, recordTypes.get(Type.DESCRIPTOR).size());
+            assertEquals(1, recordTypes.get(Type.ROOT_GROUPS).size());
+            assertEquals(1, recordTypes.get(Type.ALL_GROUPS).size());
+            assertEquals(2, recordTypes.get(Type.ARTIFACT_ADD).size());
+            assertNull(recordTypes.get(Type.ARTIFACT_REMOVE));
         }
     }
 
@@ -68,14 +67,14 @@ public class ChunkReaderTest extends TestSupport {
         }
 
         try (ChunkReader chunkReader = new ChunkReader("full", Files.newInputStream(tempChunkFile))) {
-            assertThat(chunkReader.getVersion(), equalTo(1));
-            assertThat(chunkReader.getTimestamp().getTime(), equalTo(published.getTime()));
+            assertEquals(1, chunkReader.getVersion());
+            assertEquals(published.getTime(), chunkReader.getTimestamp().getTime());
             final Map<Type, List<Record>> recordTypes = loadRecordsByType(chunkReader);
-            assertThat(recordTypes.get(Type.DESCRIPTOR).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ROOT_GROUPS).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ALL_GROUPS).size(), equalTo(1));
-            assertThat(recordTypes.get(Type.ARTIFACT_ADD).size(), equalTo(2));
-            assertThat(recordTypes.get(Type.ARTIFACT_REMOVE), nullValue());
+            assertEquals(1, recordTypes.get(Type.DESCRIPTOR).size());
+            assertEquals(1, recordTypes.get(Type.ROOT_GROUPS).size());
+            assertEquals(1, recordTypes.get(Type.ALL_GROUPS).size());
+            assertEquals(2, recordTypes.get(Type.ARTIFACT_ADD).size());
+            assertNull(recordTypes.get(Type.ARTIFACT_REMOVE));
         }
     }
 }
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
index 951509b..21dd9f6 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexReaderTest.java
@@ -32,10 +32,8 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.maven.index.reader.TestUtils.expandFunction;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.hamcrest.core.IsNot.not;
-import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * UT for {@link IndexReader}
@@ -44,26 +42,26 @@ public class IndexReaderTest extends TestSupport {
     @Test
     public void simple() throws IOException {
         try (IndexReader indexReader = new IndexReader(null, testResourceHandler("simple"))) {
-            assertThat(indexReader.getIndexId(), equalTo("apache-snapshots-local"));
-            assertThat(indexReader.getPublishedTimestamp().getTime(), equalTo(1243533418015L));
-            assertThat(indexReader.isIncremental(), equalTo(false));
-            assertThat(indexReader.getChunkNames(), equalTo(List.of("nexus-maven-repository-index.gz")));
+            assertEquals("apache-snapshots-local", indexReader.getIndexId());
+            assertEquals(1243533418015L, indexReader.getPublishedTimestamp().getTime());
+            assertEquals(false, indexReader.isIncremental());
+            assertEquals(List.of("nexus-maven-repository-index.gz"), indexReader.getChunkNames());
             int chunks = 0;
             int records = 0;
             for (ChunkReader chunkReader : indexReader) {
                 try (chunkReader) {
                     chunks++;
-                    assertThat(chunkReader.getName(), equalTo("nexus-maven-repository-index.gz"));
-                    assertThat(chunkReader.getVersion(), equalTo(1));
-                    assertThat(chunkReader.getTimestamp().getTime(), equalTo(1243533418015L));
+                    assertEquals("nexus-maven-repository-index.gz", chunkReader.getName());
+                    assertEquals(1, chunkReader.getVersion());
+                    assertEquals(1243533418015L, chunkReader.getTimestamp().getTime());
                     records = (int) StreamSupport.stream(chunkReader.spliterator(), false)
                             .map(expandFunction)
                             .count();
                 }
             }
 
-            assertThat(chunks, equalTo(1));
-            assertThat(records, equalTo(5));
+            assertEquals(1, chunks);
+            assertEquals(5, records);
         }
     }
 
@@ -71,33 +69,31 @@ public class IndexReaderTest extends TestSupport {
     public void simpleWithLocal() throws IOException {
         try (WritableResourceHandler writableResourceHandler = createWritableResourceHandler()) {
             try (IndexReader indexReader = new IndexReader(writableResourceHandler, testResourceHandler("simple"))) {
-                assertThat(indexReader.getIndexId(), equalTo("apache-snapshots-local"));
-                assertThat(indexReader.getPublishedTimestamp().getTime(), equalTo(1243533418015L));
-                assertThat(indexReader.isIncremental(), equalTo(false));
-                assertThat(indexReader.getChunkNames(), equalTo(List.of("nexus-maven-repository-index.gz")));
+                assertEquals("apache-snapshots-local", indexReader.getIndexId());
+                assertEquals(1243533418015L, indexReader.getPublishedTimestamp().getTime());
+                assertEquals(false, indexReader.isIncremental());
+                assertEquals(List.of("nexus-maven-repository-index.gz"), indexReader.getChunkNames());
                 int chunks = 0;
                 int records = 0;
                 for (ChunkReader chunkReader : indexReader) {
                     try (chunkReader) {
                         chunks++;
-                        assertThat(chunkReader.getName(), equalTo("nexus-maven-repository-index.gz"));
-                        assertThat(chunkReader.getVersion(), equalTo(1));
-                        assertThat(chunkReader.getTimestamp().getTime(), equalTo(1243533418015L));
+                        assertEquals("nexus-maven-repository-index.gz", chunkReader.getName());
+                        assertEquals(1, chunkReader.getVersion());
+                        assertEquals(1243533418015L, chunkReader.getTimestamp().getTime());
                         records = (int) StreamSupport.stream(chunkReader.spliterator(), false)
                                 .map(expandFunction)
                                 .count();
                     }
                 }
 
-                assertThat(chunks, equalTo(1));
-                assertThat(records, equalTo(5));
+                assertEquals(1, chunks);
+                assertEquals(5, records);
             }
 
-            assertThat(
-                    writableResourceHandler
-                            .locate("nexus-maven-repository-index.properties")
-                            .read(),
-                    not(nullValue()));
+            assertNotNull(writableResourceHandler
+                    .locate("nexus-maven-repository-index.properties")
+                    .read());
         }
     }
 
@@ -120,17 +116,18 @@ public class IndexReaderTest extends TestSupport {
             }
 
             try (IndexReader indexReader = new IndexReader(null, writableResourceHandler)) {
-                assertThat(indexReader.getIndexId(), equalTo("apache-snapshots-local"));
-                assertThat(indexReader.getPublishedTimestamp().getTime(), equalTo(published.getTime()));
-                assertThat(indexReader.isIncremental(), equalTo(false));
-                assertThat(indexReader.getChunkNames(), equalTo(List.of("nexus-maven-repository-index.gz")));
+                assertEquals("apache-snapshots-local", indexReader.getIndexId());
+                assertEquals(
+                        published.getTime(), indexReader.getPublishedTimestamp().getTime());
+                assertEquals(false, indexReader.isIncremental());
+                assertEquals(List.of("nexus-maven-repository-index.gz"), indexReader.getChunkNames());
                 int chunks = 0;
                 int records = 0;
                 for (ChunkReader chunkReader : indexReader) {
                     try (chunkReader) {
                         chunks++;
-                        assertThat(chunkReader.getName(), equalTo("nexus-maven-repository-index.gz"));
-                        assertThat(chunkReader.getVersion(), equalTo(1));
+                        assertEquals("nexus-maven-repository-index.gz", chunkReader.getName());
+                        assertEquals(1, chunkReader.getVersion());
                         // assertThat(chunkReader.getTimestamp().getTime(), equalTo(1243533418015L));
                         records = (int) StreamSupport.stream(chunkReader.spliterator(), false)
                                 .map(expandFunction)
@@ -138,8 +135,8 @@ public class IndexReaderTest extends TestSupport {
                     }
                 }
 
-                assertThat(chunks, equalTo(1));
-                assertThat(records, equalTo(5));
+                assertEquals(1, chunks);
+                assertEquals(5, records);
             }
         }
     }
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
index 5e83f6a..4c020dc 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/IndexWriterTest.java
@@ -25,8 +25,7 @@ import java.util.stream.StreamSupport;
 import org.junit.jupiter.api.Test;
 
 import static org.apache.maven.index.reader.TestUtils.expandFunction;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * UT for {@link IndexWriter}
@@ -47,24 +46,24 @@ public class IndexWriterTest extends TestSupport {
 
             // read what we wrote out
             try (IndexReader indexReader = new IndexReader(null, writableResourceHandler)) {
-                assertThat(indexReader.getIndexId(), equalTo("apache-snapshots-local"));
+                assertEquals("apache-snapshots-local", indexReader.getIndexId());
                 // assertThat(indexReader.getPublishedTimestamp().getTime(), equalTo(published.getTime()));
-                assertThat(indexReader.isIncremental(), equalTo(false));
-                assertThat(indexReader.getChunkNames(), equalTo(List.of("nexus-maven-repository-index.gz")));
+                assertEquals(false, indexReader.isIncremental());
+                assertEquals(List.of("nexus-maven-repository-index.gz"), indexReader.getChunkNames());
                 int chunks = 0;
                 int records = 0;
                 for (ChunkReader chunkReader : indexReader) {
                     chunks++;
-                    assertThat(chunkReader.getName(), equalTo("nexus-maven-repository-index.gz"));
-                    assertThat(chunkReader.getVersion(), equalTo(1));
+                    assertEquals("nexus-maven-repository-index.gz", chunkReader.getName());
+                    assertEquals(1, chunkReader.getVersion());
                     // assertThat(chunkReader.getTimestamp().getTime(), equalTo(1243533418015L));
                     records = (int) StreamSupport.stream(chunkReader.spliterator(), false)
                             .map(expandFunction)
                             .count();
                 }
 
-                assertThat(chunks, equalTo(1));
-                assertThat(records, equalTo(5));
+                assertEquals(1, chunks);
+                assertEquals(5, records);
             }
         }
     }
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
index bbe04b6..e87ef04 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TestSupport.java
@@ -31,8 +31,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test support.
@@ -107,7 +106,7 @@ public class TestSupport {
     protected Map<Type, List<Record>> loadRecordsByType(final ChunkReader chunkReader) throws IOException {
         HashMap<Type, List<Record>> stat = new HashMap<>();
         try (chunkReader) {
-            assertThat(chunkReader.getVersion(), equalTo(1));
+            assertEquals(1, chunkReader.getVersion());
             final RecordExpander recordExpander = new RecordExpander();
             for (Map<String, String> rec : chunkReader) {
                 final Record record = recordExpander.apply(rec);
@@ -126,7 +125,7 @@ public class TestSupport {
     protected Map<Type, Integer> countRecordsByType(final ChunkReader chunkReader) throws IOException {
         HashMap<Type, Integer> stat = new HashMap<>();
         try (chunkReader) {
-            assertThat(chunkReader.getVersion(), equalTo(1));
+            assertEquals(1, chunkReader.getVersion());
             final RecordExpander recordExpander = new RecordExpander();
             for (Map<String, String> rec : chunkReader) {
                 final Record record = recordExpander.apply(rec);
diff --git a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
index 98cf323..d8e6d37 100644
--- a/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
+++ b/indexer-reader/src/test/java/org/apache/maven/index/reader/TransformTest.java
@@ -32,9 +32,9 @@ import org.junit.jupiter.api.Test;
 
 import static org.apache.maven.index.reader.TestUtils.compactFunction;
 import static org.apache.maven.index.reader.TestUtils.decorate;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * UT for {@link RecordCompactor} and {@link RecordExpander}.
@@ -58,21 +58,19 @@ public class TransformTest extends TestSupport {
             }
 
             try (IndexReader indexReader = new IndexReader(null, writableResourceHandler)) {
-                assertThat(indexReader.getChunkNames(), equalTo(List.of("nexus-maven-repository-index.gz")));
+                assertEquals(List.of("nexus-maven-repository-index.gz"), indexReader.getChunkNames());
                 ChunkReader chunkReader = indexReader.iterator().next();
                 final Map<Type, List<Record>> recordTypes = loadRecordsByType(chunkReader);
-                assertThat(recordTypes.get(Type.DESCRIPTOR).size(), equalTo(1));
-                assertThat(recordTypes.get(Type.ROOT_GROUPS).size(), equalTo(1));
-                assertThat(recordTypes.get(Type.ALL_GROUPS).size(), equalTo(1));
-                assertThat(recordTypes.get(Type.ARTIFACT_ADD).size(), equalTo(3));
-                assertThat(recordTypes.get(Type.ARTIFACT_REMOVE), nullValue());
+                assertEquals(1, recordTypes.get(Type.DESCRIPTOR).size());
+                assertEquals(1, recordTypes.get(Type.ROOT_GROUPS).size());
+                assertEquals(1, recordTypes.get(Type.ALL_GROUPS).size());
+                assertEquals(3, recordTypes.get(Type.ARTIFACT_ADD).size());
+                assertNull(recordTypes.get(Type.ARTIFACT_REMOVE));
 
-                assertThat(
-                        recordTypes.get(Type.ROOT_GROUPS).get(0).get(Record.ROOT_GROUPS),
-                        equalTo(new String[] {"com", "org"}));
-                assertThat(
-                        recordTypes.get(Type.ALL_GROUPS).get(0).get(Record.ALL_GROUPS),
-                        equalTo(new String[] {"com.bar", "org.apache", "org.foo"}));
+                assertArrayEquals(new String[] {"com", "org"}, (Object[])
+                        recordTypes.get(Type.ROOT_GROUPS).get(0).get(Record.ROOT_GROUPS));
+                assertArrayEquals(new String[] {"com.bar", "org.apache", "org.foo"}, (Object[])
+                        recordTypes.get(Type.ALL_GROUPS).get(0).get(Record.ALL_GROUPS));
             }
         }
     }
diff --git a/pom.xml b/pom.xml
index a33ed88..1425469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,13 +244,6 @@ under the License.
       </dependency>
 
       <!-- Test -->
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest</artifactId>
-        <version>3.0</version>
-        <scope>test</scope>
-      </dependency>
-
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -271,6 +264,13 @@ under the License.
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <!-- not used directly; keeps the hamcrest that jmock pulls in on 3.0 -->
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>3.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.jmock</groupId>
         <artifactId>jmock</artifactId>
diff --git a/search-api/pom.xml b/search-api/pom.xml
index 04a83ca..b97ff17 100644
--- a/search-api/pom.xml
+++ b/search-api/pom.xml
@@ -39,12 +39,6 @@ under the License.
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/search-backend-indexer/pom.xml b/search-backend-indexer/pom.xml
index 7c35090..be22852 100644
--- a/search-backend-indexer/pom.xml
+++ b/search-backend-indexer/pom.xml
@@ -49,12 +49,6 @@ under the License.
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/search-backend-remoterepository/pom.xml b/search-backend-remoterepository/pom.xml
index 46cc39b..6057236 100644
--- a/search-backend-remoterepository/pom.xml
+++ b/search-backend-remoterepository/pom.xml
@@ -55,12 +55,6 @@ under the License.
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java b/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
index 3356c10..88c7626 100644
--- a/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
+++ b/search-backend-remoterepository/src/test/java/org/apache/maven/search/backend/remoterepository/internal/RemoteRepositorySearchBackendImplTest.java
@@ -38,11 +38,10 @@ import org.apache.maven.search.backend.remoterepository.RemoteRepositorySearchRe
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * UT for 2 backends: Maven Central and RAO releases. This tests make use of the fact that RAO is used as "staging"
@@ -137,7 +136,7 @@ public class RemoteRepositorySearchBackendImplTest {
         SearchRequest searchRequest =
                 new SearchRequest(FieldQuery.fieldQuery(MAVEN.GROUP_ID, "org.cstamas.no-such-thing"));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(0));
+        assertEquals(0, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
     }
 
@@ -149,7 +148,7 @@ public class RemoteRepositorySearchBackendImplTest {
         SearchRequest searchRequest =
                 new SearchRequest(FieldQuery.fieldQuery(MAVEN.GROUP_ID, "org.apache.maven.plugins"));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), greaterThan(0));
+        assertTrue(searchResponse.getTotalHits() > 0);
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -163,7 +162,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.GROUP_ID, "org.apache.maven.plugins"),
                 FieldQuery.fieldQuery(MAVEN.ARTIFACT_ID, "maven-clean-plugin")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), greaterThan(0));
+        assertTrue(searchResponse.getTotalHits() > 0);
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -178,7 +177,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.ARTIFACT_ID, "maven-clean-plugin"),
                 FieldQuery.fieldQuery(MAVEN.VERSION, "3.1.0")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(5));
+        assertEquals(5, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -194,8 +193,8 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.VERSION, "3.1.0"),
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "jar")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(1));
-        assertThat(searchResponse.getPage().get(0).getLastUpdated(), notNullValue());
+        assertEquals(1, searchResponse.getTotalHits());
+        assertNotNull(searchResponse.getPage().get(0).getLastUpdated());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -210,7 +209,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.ARTIFACT_ID, "apache-maven"),
                 FieldQuery.fieldQuery(MAVEN.VERSION, "3.9.3")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(8));
+        assertEquals(8, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -226,7 +225,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.VERSION, "3.1.0"),
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "jar")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(1));
+        assertEquals(1, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -243,7 +242,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "jar"),
                 FieldQuery.fieldQuery(MAVEN.SHA1, "2e030994e207ee572491927b198b139424133b2e")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(1));
+        assertEquals(1, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -260,7 +259,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "jar"),
                 FieldQuery.fieldQuery(MAVEN.SHA1, "wrong")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(0));
+        assertEquals(0, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -278,7 +277,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "tar.gz"),
                 FieldQuery.fieldQuery(MAVEN.SHA1, "f700d2bf6a11803c29a3240a26e91b2d1c530f79")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(1));
+        assertEquals(1, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
@@ -296,7 +295,7 @@ public class RemoteRepositorySearchBackendImplTest {
                 FieldQuery.fieldQuery(MAVEN.FILE_EXTENSION, "tar.gz"),
                 FieldQuery.fieldQuery(MAVEN.SHA1, "wrong")));
         RemoteRepositorySearchResponse searchResponse = backend.search(searchRequest);
-        assertThat(searchResponse.getTotalHits(), equalTo(0));
+        assertEquals(0, searchResponse.getTotalHits());
         System.out.println("TOTAL HITS: " + searchResponse.getTotalHits());
         dumpPage(searchResponse);
     }
diff --git a/search-backend-smo/pom.xml b/search-backend-smo/pom.xml
index ac6446b..4c10e53 100644
--- a/search-backend-smo/pom.xml
+++ b/search-backend-smo/pom.xml
@@ -50,12 +50,6 @@ under the License.
       <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>