HSEARCH-3877 Upgrade to awaitily 4.0.2 / hamcrest 2.2

hibernate · Apr 2, 2020 · ce3bd9a · ce3bd9a
1 parent f2390c4
commit ce3bd9a
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -233,11 +233,11 @@
         <version.org.slf4j>1.7.30</version.org.slf4j>
         <version.log4j>1.2.16</version.log4j>
         <version.junit>4.13</version.junit>
+        <version.org.hamcrest>2.2</version.org.hamcrest>
         <version.org.easymock>4.2</version.org.easymock>
         <version.org.unitils>3.4.6</version.org.unitils>
         <version.org.assertj.assertj-core>3.13.2</version.org.assertj.assertj-core>
-        <!-- We can't upgrade to awaitility 4 at the moment because it depends on Hamcrest 2.x, and JUnit 4 needs Hamcrest 1.x -->
-        <version.org.awaitily>3.1.6</version.org.awaitily>
+        <version.org.awaitily>4.0.2</version.org.awaitily>
         <version.org.skyscreamer.jsonassert>1.2.3</version.org.skyscreamer.jsonassert>
         <version.io.takari.junit>1.2.7</version.io.takari.junit>
         <version.com.h2database>1.4.178</version.com.h2database>
@@ -925,6 +925,25 @@
                 <artifactId>junit</artifactId>
                 <version>${version.junit}</version>
             </dependency>
+            <!--
+                Manage the upgrade from Hamcrest 1.x to 2.x:
+                http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x
+             -->
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>${version.org.hamcrest}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>${version.org.hamcrest}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
+                <version>${version.org.hamcrest}</version>
+            </dependency>
             <dependency>
                 <groupId>io.takari.junit</groupId>
                 <artifactId>takari-cpsuite</artifactId>