From cc79530c9c5ab40ae96b8cff68782839cf72651f Mon Sep 17 00:00:00 2001 From: dupirefr Date: Tue, 3 Mar 2020 07:06:06 +0100 Subject: [PATCH] [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 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test diff --git a/pom.xml b/pom.xml index f64d34aa63..bdcd7724b5 100644 --- a/pom.xml +++ b/pom.xml @@ -59,13 +59,7 @@ org.hamcrest - hamcrest-core - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-library + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ test - - - - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ test - - - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test 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 @@ org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library + hamcrest test