From 5bd769a6fb157b0d2697741bf156ca9ffe31a374 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:31:40 -0500
Subject: [PATCH 1/6] [MCHANGES-462] Avoid conflicts in Hamcrest versions

---
 pom.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a4f0920..52b57b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +181,16 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.javamail</groupId>
+      <artifactId>geronimo-javamail_1.4_provider</artifactId>
+      <version>1.8.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.4_spec</artifactId>
+      <version>1.7.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.4_mail</artifactId>
@@ -334,7 +344,7 @@ under the License.
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>3.0</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From d96b82fda40470e551351f93e427e6296b910265 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:32:43 -0500
Subject: [PATCH 2/6] wip

---
 pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52b57b54..3222b568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,16 +181,6 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.javamail</groupId>
-      <artifactId>geronimo-javamail_1.4_provider</artifactId>
-      <version>1.8.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.4_spec</artifactId>
-      <version>1.7.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.geronimo.javamail</groupId>
       <artifactId>geronimo-javamail_1.4_mail</artifactId>

From ea5858f8063e345dfefe4925d6f3ad68708da2ff Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:33:30 -0500
Subject: [PATCH 3/6] comment

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3222b568..68f5312d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,7 @@ under the License.
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <version>1.3</version> <!-- matches version from JUnit -->
       <scope>test</scope>
     </dependency>
     <dependency>

From a2fe4a0a00d4fe9316c5672f474ffffd46afef9d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:36:55 -0500
Subject: [PATCH 4/6] spotless

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68f5312d..bd5cf60f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,7 +334,8 @@ under the License.
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version> <!-- matches version from JUnit -->
+      <version>1.3</version>
+      <!-- matches version from JUnit -->
       <scope>test</scope>
     </dependency>
     <dependency>

From 318b68cfdbdc37122b4cdaae8005af738cf3c4c0 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:37:59 -0500
Subject: [PATCH 5/6] comment

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bd5cf60f..2ff105cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,8 +334,8 @@ under the License.
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
       <!-- matches version from JUnit -->
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From f11774ddecb54f910cfa4b97afb37229fb9d5a7c Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 30 Dec 2024 10:53:28 -0500
Subject: [PATCH 6/6] Remove Hamcrest dependency

---
 pom.xml                                                    | 7 -------
 .../maven/plugins/changes/ChangesCheckMojoTestCase.java    | 5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ff105cd..b587f613 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,13 +331,6 @@ under the License.
       <version>4.11.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <!-- matches version from JUnit -->
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
diff --git a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
index 7eef30d0..010c8cc5 100644
--- a/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/changes/ChangesCheckMojoTestCase.java
@@ -20,10 +20,9 @@
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.startsWith;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeThat;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * @author Dennis Lundberg
@@ -113,7 +112,7 @@ public void testIsValidateWithLocale() {
     public void testCompat() {
         // @TODO fix for Java 9+
         // System.setProperty( "java.locale.providers", "COMPAT,CLDR" ) is not picked up...
-        assumeThat(System.getProperty("java.version"), startsWith("1."));
+        assumeTrue(System.getProperty("java.version").startsWith("1."));
 
         // pattern with months as text
         String pattern = "dd MMM yyyy";