Update hamcrest to v2.2

cushon · Error Prone Team · commit 3fff6105290f · 2024-05-28T12:46:43.000-07:00
PiperOrigin-RevId: 637991390
diff --git a/core/pom.xml b/core/pom.xml
@@ -144,14 +144,14 @@
       <!-- BSD New (3 clause) -->
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <!-- BSD New (3 clause) -->
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/ExpectedExceptionChecker.java
@@ -78,9 +78,15 @@ public class ExpectedExceptionChecker extends BugChecker implements MethodTreeMa
               .withNameMatching(Pattern.compile("expect.*")));
 
   static final Matcher<ExpressionTree> IS_A =
-      staticMethod()
-          .onClassAny("org.hamcrest.Matchers", "org.hamcrest.CoreMatchers", "org.hamcrest.core.Is")
-          .withSignature("<T>isA(java.lang.Class<T>)");
+      anyOf(
+          staticMethod()
+              .onClassAny(
+                  "org.hamcrest.Matchers", "org.hamcrest.CoreMatchers", "org.hamcrest.core.Is")
+              .withSignature("<T>isA(java.lang.Class<T>)"),
+          staticMethod()
+              .onClassAny(
+                  "org.hamcrest.Matchers", "org.hamcrest.CoreMatchers", "org.hamcrest.core.Is")
+              .withSignature("<T>isA(java.lang.Class<?>)"));
 
   static final Matcher<StatementTree> FAIL_MATCHER =
       anyOf(
