From 33f0ff46f451e9ef62dcfe194df671856dd1cd61 Mon Sep 17 00:00:00 2001
From: Picnic-Bot <sysops@teampicnic.com>
Date: Sat, 23 Apr 2022 12:34:33 +0000
Subject: [PATCH 1/2] Upgrade org.hamcrest:hamcrest-library 1.3 -> 2.2

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

diff --git a/pom.xml b/pom.xml
index 3dea95c005..e7988b8c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -345,7 +345,7 @@
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-library</artifactId>
-                <version>1.3</version>
+                <version>2.2</version>
             </dependency>
             <dependency>
                 <groupId>org.junit</groupId>

From b73183c8f68f3bd3d476b22c3e4e07c2405f7a01 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sat, 23 Apr 2022 18:55:27 +0200
Subject: [PATCH 2/2] Migrate to `org.hamcrest:hamcrest`

(JUnit 4 still declares a dependency on `hamcrest-{core,library}`.)
---
 error-prone-contrib/pom.xml |  2 +-
 pom.xml                     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/error-prone-contrib/pom.xml b/error-prone-contrib/pom.xml
index 007c159397..a49552a2d0 100644
--- a/error-prone-contrib/pom.xml
+++ b/error-prone-contrib/pom.xml
@@ -138,7 +138,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index e7988b8c38..6d89ebf8e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
         <version.error-prone-slf4j>0.1.4</version.error-prone-slf4j>
         <version.findbugs-format-string>3.0.0</version.findbugs-format-string>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>
+        <version.hamcrest>2.2</version.hamcrest>
         <version.jdk>11</version.jdk>
         <version.maven>3.6.3</version.maven>
         <version.mockito>4.0.0</version.mockito>
@@ -342,10 +343,20 @@
                 <artifactId>checker-qual</artifactId>
                 <version>3.19.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>${version.hamcrest}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>${version.hamcrest}</version>
+            </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-library</artifactId>
-                <version>2.2</version>
+                <version>${version.hamcrest}</version>
             </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
@@ -1002,6 +1013,7 @@
                                 BSD-3-Clause
                                 | 3-Clause BSD License
                                 | BSD 3-clause
+                                | BSD License 3
                                 | Eclipse Distribution License (New BSD License)
                                 | New BSD License
                             </licenseMerge>