From e39c4259f7c6ace8efc02b414f4fe2e444e92e95 Mon Sep 17 00:00:00 2001
From: teleivo <teleivo@users.noreply.github.com>
Date: Fri, 17 Jul 2020 12:11:09 +0200
Subject: [PATCH] TRUNK-5982 Adapt to new hamcrest packaging

hamcrest as of 2.x ships what was previously in hamcrest-core and
hamcrest-library in a single jar at artifact coordinate
org.hamcrest:hamcrest

So as of 2.x you only need to depend on the org.hamcrest:hamcrest.
Since JUnit 4 depends on hamcrest-core we need to follow these steps
http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x
https://github.com/hamcrest/JavaHamcrest/issues/224#issuecomment-449760045

to make sure also hamcrest-core is updated. The dependency on
hamcrest-core can be removed once JUnit 4 support is dropped.
---
 liquibase/pom.xml |  2 +-
 pom.xml           | 12 +++++++++---
 test/pom.xml      | 21 +++++++++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/liquibase/pom.xml b/liquibase/pom.xml
index dba7f9c05a3e..7e2067640d5c 100644
--- a/liquibase/pom.xml
+++ b/liquibase/pom.xml
@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
+			<artifactId>hamcrest</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index bbdac573bc51..ad96ebe0fe42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -521,15 +521,20 @@
 				<artifactId>powermock-api-mockito2</artifactId>
 				<version>2.0.9</version>
 			</dependency>
+			<!--hamcrest-core is needed to update JUnit 4 transitive dependency on hamcrest-core as explained in
+			 http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x and
+			 https://github.com/hamcrest/JavaHamcrest/issues/224#issuecomment-449760045
+			 Once we remove JUnit 4 we will only need org.hamcrest:hamcrest
+			 -->
 			<dependency>
 				<groupId>org.hamcrest</groupId>
 				<artifactId>hamcrest-core</artifactId>
-				<version>2.2</version>
+				<version>${hamcrestVersion}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-library</artifactId>
-				<version>2.2</version>
+				<artifactId>hamcrest</artifactId>
+				<version>${hamcrestVersion}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.h2database</groupId>
@@ -1151,6 +1156,7 @@
 		<jacksonVersion>2.12.0</jacksonVersion>
 		<junitVersion>5.7.0</junitVersion>
 		<mockitoVersion>3.6.28</mockitoVersion>
+		<hamcrestVersion>2.2</hamcrestVersion>
 
 		<slf4jVersion> 1.7.30</slf4jVersion>
 		<log4jVersion>2.14.0</log4jVersion>
diff --git a/test/pom.xml b/test/pom.xml
index 5c3c37a13bef..30e8fdbdaffb 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -66,14 +66,19 @@
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito2</artifactId>
 		</dependency>
-		<dependency>
-		    <groupId>org.hamcrest</groupId>
-		    <artifactId>hamcrest-core</artifactId>
-		</dependency>
-		<dependency>
-		    <groupId>org.hamcrest</groupId>
-		    <artifactId>hamcrest-library</artifactId>
-		</dependency>
+	   <!--hamcrest-core is needed to update JUnit 4 transitive dependency on hamcrest-core as explained in
+		http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x and
+		https://github.com/hamcrest/JavaHamcrest/issues/224#issuecomment-449760045
+		Once we remove JUnit 4 we will only need org.hamcrest:hamcrest
+		-->
+	   <dependency>
+		   <groupId>org.hamcrest</groupId>
+		   <artifactId>hamcrest-core</artifactId>
+	   </dependency>
+	   <dependency>
+		   <groupId>org.hamcrest</groupId>
+		   <artifactId>hamcrest</artifactId>
+	   </dependency>
    </dependencies>
 	
 	<build>