From 9905daf772d16290bbc9cc4ecb6726d58cb4d85b Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sun, 8 Dec 2024 06:56:44 +0000
Subject: [PATCH] Upgrade Hamcrest to 3.0

If upstream changelogs are to be believed, there are no
breaking changes except for:
* The packaging method being changed[1] from several JARs
  to one JAR.
* An annotation, `org.hamcrest.Factory`, being removed
  (we don't use it, and upstream says that people should
  not have been using it externally)
* The minimum version being upgraded to Java 8[2],
  which is already the case in Ant.

[1]: https://github.com/hamcrest/JavaHamcrest/releases/tag/v2.1
[2]: https://github.com/hamcrest/JavaHamcrest/releases/tag/v3.0
---
 build.xml                                                | 3 +--
 fetch.xml                                                | 2 +-
 lib/libraries.properties                                 | 7 +++----
 src/etc/poms/pom.xml                                     | 4 ++--
 src/etc/testcases/taskdefs/optional/junitlauncher.xml    | 2 +-
 src/tests/antunit/taskdefs/optional/junit/junit-test.xml | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index 36abf45032..638873a39f 100644
--- a/build.xml
+++ b/build.xml
@@ -1211,8 +1211,7 @@
       <fileset dir="${lib.dir}">
         <include name="optional/junit-3.8.2.jar"/>
         <include name="optional/junit-4.13.2.jar"/>
-        <include name="optional/hamcrest-core-1.3.jar"/>
-        <include name="optional/hamcrest-library-1.3.jar"/>
+        <include name="optional/hamcrest-3.0.jar"/>
         <include name="README"/>
         <include name="libraries.properties"/>
       </fileset>
diff --git a/fetch.xml b/fetch.xml
index 599b8f298d..3b09c7e632 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -234,7 +234,7 @@ Set -Ddest=LOCATION on the command line
           description="load JUnit libraries"
           depends="init">
     <f2 project="junit"/>
-    <f2 project="org.hamcrest" archive="hamcrest-library"/>
+    <f2 project="org.hamcrest" archive="hamcrest"/>
   </target>
 
   <target name="junitlauncher"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 8be814b7c0..86fba5a19e 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -44,12 +44,11 @@ commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
 js.version=20.1.0
 js-scriptengine.version=${js.version}
-# Note - When updating the hamcrest versions here, make sure to also update the
-# "src-dist" target in build.xml to copy the correct hamcrest jars
+# Note - When updating the hamcrest version here, make sure to also update the
+# "src-dist" target in build.xml to copy the correct hamcrest jar
 # into the source distribution. Also update the hamcrest dependency
 # version in src/etc/poms/pom.xml.
-hamcrest-core.version=1.3
-hamcrest-library.version=${hamcrest-core.version}
+hamcrest.version=3.0
 jai-core.version=1.1.3
 jai-codec.version=1.1.3
 netrexx.version=2.05
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 9cf6c67280..f4babf1655 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -117,8 +117,8 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
+      <artifactId>hamcrest</artifactId>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/src/etc/testcases/taskdefs/optional/junitlauncher.xml b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
index c3e4b5651f..e2b031035c 100644
--- a/src/etc/testcases/taskdefs/optional/junitlauncher.xml
+++ b/src/etc/testcases/taskdefs/optional/junitlauncher.xml
@@ -31,7 +31,7 @@
     <path id="junit.engine.vintage.classpath">
         <fileset dir="../../../../../lib/optional" includes="junit-vintage-engine*.jar"/>
         <fileset dir="../../../../../lib/optional" includes="junit-*.jar"/>
-        <fileset dir="../../../../../lib/optional" includes="hamcrest*.jar"/>
+        <fileset dir="../../../../../lib/optional" includes="hamcrest-*.jar"/>
         <fileset dir="../../../../../lib/optional" includes="opentest4j*.jar"/>
     </path>
 
diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index 876afb82cd..7ee9dd1d02 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -20,7 +20,7 @@
 
   <path id="junit">
     <fileset dir="../../../../../../lib/optional" includes="junit*" />
-    <fileset dir="../../../../../../lib/optional" includes="hamcrest-core*" />
+    <fileset dir="../../../../../../lib/optional" includes="hamcrest-*" />
   </path>
 
   <macrodef name="empty-test">