From a3e0e8726b6ef5cd4290d860d40c49c5840c4876 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 28 Feb 2020 07:51:15 +0100
Subject: [PATCH 01/10] [JAVA-131] Updated hamcrest version from 1.3 to 2.2

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

diff --git a/pom.xml b/pom.xml
index 0bcfac7963..ef9f0e1555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1333,7 +1333,7 @@
         <gib.enabled>false</gib.enabled>
 
         <junit.version>4.12</junit.version>
-        <org.hamcrest.version>1.3</org.hamcrest.version>
+        <org.hamcrest.version>2.2</org.hamcrest.version>
         <mockito.version>2.21.0</mockito.version>
 
         <!-- logging -->

From 0a6ee0c79715b792ba01048a9a40dec5b9fd530d Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 28 Feb 2020 21:18:42 +0100
Subject: [PATCH 02/10] [JAVA-131] Kept difference between hamcrest and
 hamcrest-all

---
 cdi/pom.xml                                            |  2 +-
 .../core-java-string-conversions-2/pom.xml             |  2 +-
 core-java-modules/core-java-string-conversions/pom.xml |  2 +-
 .../core-java-string-operations-2/pom.xml              |  2 +-
 ethereum/pom.xml                                       |  2 +-
 pom.xml                                                | 10 +++++-----
 testing-modules/selenium-junit-testng/pom.xml          |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cdi/pom.xml b/cdi/pom.xml
index 87ad9c111a..3387575254 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
index 58b00b757a..0ac9a247fb 100644
--- a/core-java-modules/core-java-string-conversions-2/pom.xml
+++ b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core-java-modules/core-java-string-conversions/pom.xml b/core-java-modules/core-java-string-conversions/pom.xml
index e3d6036e53..6d4cc02612 100644
--- a/core-java-modules/core-java-string-conversions/pom.xml
+++ b/core-java-modules/core-java-string-conversions/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core-java-modules/core-java-string-operations-2/pom.xml b/core-java-modules/core-java-string-operations-2/pom.xml
index 7bb687ea2b..e900a17a30 100644
--- a/core-java-modules/core-java-string-operations-2/pom.xml
+++ b/core-java-modules/core-java-string-operations-2/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index 1449d9d95c..8e79d4a36a 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index ef9f0e1555..f64d34aa63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,19 +60,19 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest-all.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -1333,7 +1333,8 @@
         <gib.enabled>false</gib.enabled>
 
         <junit.version>4.12</junit.version>
-        <org.hamcrest.version>2.2</org.hamcrest.version>
+        <hamcrest.version>2.2</hamcrest.version>
+        <hamcrest-all.version>1.3</hamcrest-all.version>
         <mockito.version>2.21.0</mockito.version>
 
         <!-- logging -->
@@ -1351,7 +1352,6 @@
         <esapi.version>2.1.0.1</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator.version>1.19</jmh-generator.version>
-        <hamcrest-all.version>1.3</hamcrest-all.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
         <commons-io.version>2.5</commons-io.version>
diff --git a/testing-modules/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml
index 0616cdaa29..ea8603c698 100644
--- a/testing-modules/selenium-junit-testng/pom.xml
+++ b/testing-modules/selenium-junit-testng/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
-            <version>${org.hamcrest.version}</version>
+            <version>${hamcrest.version}</version>
         </dependency>
     </dependencies>
 

From fa4898356b8c57e0142fa052bfb6cfa03b790774 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 28 Feb 2020 21:27:12 +0100
Subject: [PATCH 03/10] [JAVA-131] Fixed hamcrest-all version in selenium
 module

---
 testing-modules/selenium-junit-testng/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing-modules/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml
index ea8603c698..3734bf72c9 100644
--- a/testing-modules/selenium-junit-testng/pom.xml
+++ b/testing-modules/selenium-junit-testng/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
-            <version>${hamcrest.version}</version>
+            <version>${hamcrest-all.version}</version>
         </dependency>
     </dependencies>
 
@@ -71,4 +71,4 @@
         <selenium-java.version>3.4.0</selenium-java.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From 4d5e21b99191070e259eaeecdfc924e6ac473455 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 29 Feb 2020 08:04:27 +0100
Subject: [PATCH 04/10] [JAVA-131] Removed unused version of java-hamcrest from
 mockito module

---
 testing-modules/mockito/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testing-modules/mockito/pom.xml b/testing-modules/mockito/pom.xml
index 0fb11d23ab..aae3981c66 100644
--- a/testing-modules/mockito/pom.xml
+++ b/testing-modules/mockito/pom.xml
@@ -90,7 +90,6 @@
 
         <!-- testing -->
         <powermock.version>2.0.2</powermock.version>
-        <hamcrest.version>2.0.0.0</hamcrest.version>
         <javax.persistence.version>2.1.1</javax.persistence.version>
     </properties>
 

From 1cac276528cb07a23e65d4a0ee2dbf6e8794be67 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sun, 1 Mar 2020 10:48:45 +0100
Subject: [PATCH 05/10] [JAVA-131] Renaming java-hamcrest version property to
 avoid conflict with other hamcrest libraries

---
 testing-modules/hamcrest/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing-modules/hamcrest/pom.xml b/testing-modules/hamcrest/pom.xml
index cfd5bf5fac..ec9177d8f2 100644
--- a/testing-modules/hamcrest/pom.xml
+++ b/testing-modules/hamcrest/pom.xml
@@ -18,13 +18,13 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
-            <version>${hamcrest.version}</version>
+            <version>${java-hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
-        <hamcrest.version>2.0.0.0</hamcrest.version>
+        <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
     </properties>
 
 </project>

From 892ec576a2cf30465bd406d44ea705bdf3beceab Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Mon, 2 Mar 2020 23:12:11 +0100
Subject: [PATCH 06/10] [JAVA-131] Updated java-hamcrest version property in
 spring-testing module

---
 testing-modules/spring-testing/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index 38e7a0dd46..c5e94f3afc 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
-            <version>${hamcrest.version}</version>
+            <version>${java-hamcrest.version}</version>
         </dependency>
 
         <dependency>
@@ -114,7 +114,7 @@
 
     <properties>
         <!-- testing -->
-        <hamcrest.version>2.0.0.0</hamcrest.version>
+        <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
         <awaitility.version>3.1.6</awaitility.version>
         <junit.jupiter.version>5.5.0</junit.jupiter.version>
         <junit.commons.version>1.5.2</junit.commons.version>

From cc79530c9c5ab40ae96b8cff68782839cf72651f Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Tue, 3 Mar 2020 07:06:06 +0100
Subject: [PATCH 07/10] [JAVA-131] Unifying hamcrest-core and
 hamcrest-libraries dependencies under hamcrest

---
 cdi/pom.xml                                               | 2 +-
 core-java-modules/core-java-string-conversions-2/pom.xml  | 2 +-
 core-java-modules/core-java-string-conversions/pom.xml    | 2 +-
 core-java-modules/core-java-string-operations-2/pom.xml   | 2 +-
 ethereum/pom.xml                                          | 2 +-
 pom.xml                                                   | 8 +-------
 spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml      | 2 +-
 spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml     | 7 +------
 spring-core-2/pom.xml                                     | 7 +------
 spring-rest-query-language/pom.xml                        | 8 +-------
 spring-rest-simple/pom.xml                                | 7 +------
 spring-rest-testing/pom.xml                               | 7 +------
 spring-resttemplate/pom.xml                               | 7 +------
 .../spring-security-cache-control/pom.xml                 | 7 +------
 .../spring-security-mvc-boot-1/pom.xml                    | 7 +------
 .../spring-security-mvc-boot-2/pom.xml                    | 7 +------
 .../spring-security-rest-custom/pom.xml                   | 7 +------
 17 files changed, 17 insertions(+), 74 deletions(-)

diff --git a/cdi/pom.xml b/cdi/pom.xml
index 3387575254..32b9c8a360 100644
--- a/cdi/pom.xml
+++ b/cdi/pom.xml
@@ -26,7 +26,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml
index 0ac9a247fb..9f2276b212 100644
--- a/core-java-modules/core-java-string-conversions-2/pom.xml
+++ b/core-java-modules/core-java-string-conversions-2/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/core-java-modules/core-java-string-conversions/pom.xml b/core-java-modules/core-java-string-conversions/pom.xml
index 6d4cc02612..7f8fe6468f 100644
--- a/core-java-modules/core-java-string-conversions/pom.xml
+++ b/core-java-modules/core-java-string-conversions/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/core-java-modules/core-java-string-operations-2/pom.xml b/core-java-modules/core-java-string-operations-2/pom.xml
index e900a17a30..b882e499b2 100644
--- a/core-java-modules/core-java-string-operations-2/pom.xml
+++ b/core-java-modules/core-java-string-operations-2/pom.xml
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/ethereum/pom.xml b/ethereum/pom.xml
index 8e79d4a36a..8c7e4c8c4c 100644
--- a/ethereum/pom.xml
+++ b/ethereum/pom.xml
@@ -159,7 +159,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index f64d34aa63..bdcd7724b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,13 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>${hamcrest.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
index fd524a1a4a..67df052911 100644
--- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml
index 09c94663b1..7978d9c77b 100644
--- a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml
@@ -24,12 +24,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index 4d474d8b2c..edbb351bd0 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -135,12 +135,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-rest-query-language/pom.xml b/spring-rest-query-language/pom.xml
index 25b149367e..2423528743 100644
--- a/spring-rest-query-language/pom.xml
+++ b/spring-rest-query-language/pom.xml
@@ -206,15 +206,9 @@
             <scope>test</scope>
         </dependency>
 
-
-        <!-- <dependency> -->
-        <!-- <groupId>org.hamcrest</groupId> -->
-        <!-- <artifactId>hamcrest-core</artifactId> -->
-        <!-- <scope>test</scope> -->
-        <!-- </dependency> -->
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/spring-rest-simple/pom.xml b/spring-rest-simple/pom.xml
index 59f7a94b8d..291053c87f 100644
--- a/spring-rest-simple/pom.xml
+++ b/spring-rest-simple/pom.xml
@@ -139,12 +139,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-rest-testing/pom.xml b/spring-rest-testing/pom.xml
index dcd8b677be..d807459cad 100644
--- a/spring-rest-testing/pom.xml
+++ b/spring-rest-testing/pom.xml
@@ -177,14 +177,9 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- <dependency> -->
-        <!-- <groupId>org.hamcrest</groupId> -->
-        <!-- <artifactId>hamcrest-core</artifactId> -->
-        <!-- <scope>test</scope> -->
-        <!-- </dependency> -->
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/spring-resttemplate/pom.xml b/spring-resttemplate/pom.xml
index 138fde3b45..05660f5210 100644
--- a/spring-resttemplate/pom.xml
+++ b/spring-resttemplate/pom.xml
@@ -130,12 +130,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-security-modules/spring-security-cache-control/pom.xml b/spring-security-modules/spring-security-cache-control/pom.xml
index ff96ae78dd..d8a4839991 100644
--- a/spring-security-modules/spring-security-cache-control/pom.xml
+++ b/spring-security-modules/spring-security-cache-control/pom.xml
@@ -42,12 +42,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/spring-security-modules/spring-security-mvc-boot-1/pom.xml b/spring-security-modules/spring-security-mvc-boot-1/pom.xml
index 3eeac80d2c..7dfee200d4 100644
--- a/spring-security-modules/spring-security-mvc-boot-1/pom.xml
+++ b/spring-security-modules/spring-security-mvc-boot-1/pom.xml
@@ -61,12 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-security-modules/spring-security-mvc-boot-2/pom.xml b/spring-security-modules/spring-security-mvc-boot-2/pom.xml
index fca38b9714..565528e070 100644
--- a/spring-security-modules/spring-security-mvc-boot-2/pom.xml
+++ b/spring-security-modules/spring-security-mvc-boot-2/pom.xml
@@ -61,12 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/spring-security-modules/spring-security-rest-custom/pom.xml b/spring-security-modules/spring-security-rest-custom/pom.xml
index d9072ec8a2..b4f0f93bb6 100644
--- a/spring-security-modules/spring-security-rest-custom/pom.xml
+++ b/spring-security-modules/spring-security-rest-custom/pom.xml
@@ -136,12 +136,7 @@
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

From 083d80287935de6e7632166dc8879723ab21f59b Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Tue, 3 Mar 2020 07:41:32 +0100
Subject: [PATCH 08/10] [JAVA-131] Giving version to hamcrest library in
 spring-security-modules

---
 spring-security-modules/spring-security-cache-control/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-security-modules/spring-security-cache-control/pom.xml b/spring-security-modules/spring-security-cache-control/pom.xml
index d8a4839991..acc37b41ef 100644
--- a/spring-security-modules/spring-security-cache-control/pom.xml
+++ b/spring-security-modules/spring-security-cache-control/pom.xml
@@ -43,6 +43,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
 

From f881a11e439655ef67b4f8a3f8064115cdf6c883 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 5 Mar 2020 07:57:56 +0100
Subject: [PATCH 09/10] [JAVA-131] Reverted hamcrest to hamcrest-core because
 version used is 1.3 in Greetings module

---
 spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
index 67df052911..d5d89c2ec4 100644
--- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
+            <artifactId>hamcrest-core</artifactId>
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
@@ -75,4 +75,4 @@
         <hamcrest.version>1.3</hamcrest.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>

From bc2c937183df9a66df534f7aa1e3d7f2f4e7aa76 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Thu, 5 Mar 2020 08:08:43 +0100
Subject: [PATCH 10/10] [JAVA-131] Renaming the property works better

---
 spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
index d5d89c2ec4..ac469d8bc4 100644
--- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
@@ -65,14 +65,14 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>${hamcrest.version}</version>
+            <version>${hamcrest-core.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <properties>
         <spring-cloud-starter-feign.version>1.2.5.RELEASE</spring-cloud-starter-feign.version>
-        <hamcrest.version>1.3</hamcrest.version>
+        <hamcrest-core.version>1.3</hamcrest-core.version>
     </properties>
 
 </project>