diff --git a/geowebcache/arcgiscache/pom.xml b/geowebcache/arcgiscache/pom.xml
index 06d0fa359..165eeffc3 100644
--- a/geowebcache/arcgiscache/pom.xml
+++ b/geowebcache/arcgiscache/pom.xml
@@ -27,21 +27,11 @@
-
- junit
- junit
- test
-
org.easymock
easymock
test
-
- org.hamcrest
- hamcrest-library
- test
-
org.springframework
spring-test
diff --git a/geowebcache/azureblob/pom.xml b/geowebcache/azureblob/pom.xml
index 2084bdeb0..7da2dcfdf 100644
--- a/geowebcache/azureblob/pom.xml
+++ b/geowebcache/azureblob/pom.xml
@@ -30,11 +30,6 @@
log4j-slf4j-impl
-
- junit
- junit
- test
-
org.mockito
mockito-core
@@ -51,11 +46,6 @@
tests
test
-
- org.hamcrest
- hamcrest-library
- test
-
javax.servlet
javax.servlet-api
diff --git a/geowebcache/core/pom.xml b/geowebcache/core/pom.xml
index b7b0305d5..64d8f36d8 100644
--- a/geowebcache/core/pom.xml
+++ b/geowebcache/core/pom.xml
@@ -180,21 +180,6 @@
httpclient
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-library
- test
-
-
- org.hamcrest
- hamcrest-integration
- test
-
org.mockito
mockito-core
diff --git a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java
index 50804784a..9461804a3 100644
--- a/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java
+++ b/geowebcache/core/src/test/java/org/geowebcache/filter/parameters/ParametersUtilsTest.java
@@ -16,8 +16,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.isEmptyString;
import java.util.Collections;
import java.util.Map;
@@ -35,7 +35,7 @@ public class ParametersUtilsTest {
@Test
public void testEmptyToKVP() {
String result = ParametersUtils.getKvp(Collections.emptyMap());
- assertThat(result, isEmptyString());
+ assertThat(result, emptyString());
}
@Test
diff --git a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java b/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java
index 779fa8c25..118672bf8 100644
--- a/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java
+++ b/geowebcache/core/src/test/java/org/geowebcache/seed/TruncateBboxRequestTest.java
@@ -28,12 +28,14 @@
import java.util.Map;
import java.util.Set;
import org.easymock.EasyMock;
+import org.easymock.IArgumentMatcher;
import org.geowebcache.grid.BoundingBox;
import org.geowebcache.grid.GridSubset;
import org.geowebcache.layer.TileLayer;
import org.geowebcache.mime.ImageMime;
import org.geowebcache.storage.StorageBroker;
-import org.hamcrest.integration.EasyMock2Adapter;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
import org.junit.Test;
public class TruncateBboxRequestTest {
@@ -47,7 +49,7 @@ protected SeedRequest seedRequest(
int maxZ,
BoundingBox bounds,
Map parameters) {
- EasyMock2Adapter.adapt(
+ Matcher
-
- junit
- junit
- test
-
org.easymock
easymock
@@ -46,11 +41,6 @@
tests
test
-
- org.hamcrest
- hamcrest-library
- test
-
javax.servlet
javax.servlet-api
diff --git a/geowebcache/diskquota/jdbc/pom.xml b/geowebcache/diskquota/jdbc/pom.xml
index 75100e727..3577d8298 100644
--- a/geowebcache/diskquota/jdbc/pom.xml
+++ b/geowebcache/diskquota/jdbc/pom.xml
@@ -36,11 +36,6 @@
-
- junit
- junit
- test
-
org.easymock
easymock
@@ -58,11 +53,6 @@
tests
test
-
- org.hamcrest
- hamcrest-library
- test
-
javax.servlet
javax.servlet-api
diff --git a/geowebcache/mbtiles/pom.xml b/geowebcache/mbtiles/pom.xml
index 749aad454..d8fb712d5 100644
--- a/geowebcache/mbtiles/pom.xml
+++ b/geowebcache/mbtiles/pom.xml
@@ -33,21 +33,11 @@
-
- junit
- junit
- test
-
org.easymock
easymock
test
-
- org.hamcrest
- hamcrest-library
- test
-
org.springframework
spring-test
diff --git a/geowebcache/pom.xml b/geowebcache/pom.xml
index 823fdc0d1..4244a45f8 100644
--- a/geowebcache/pom.xml
+++ b/geowebcache/pom.xml
@@ -64,6 +64,7 @@
1.12.0
1.5
33.2.1-jre
+ 3.0
3.0.1
2.17.2
1.1.119
@@ -273,17 +274,29 @@
junit
4.13.2
test
+
+
+ hamcrest-core
+ org.hamcrest
+
+
org.hamcrest
- hamcrest-library
- 1.3
+ hamcrest
+ ${hamcrest.version}
test
org.hamcrest
- hamcrest-integration
- 1.3
+ hamcrest-core
+ ${hamcrest.version}
+ test
+
+
+ org.hamcrest
+ hamcrest-library
+ ${hamcrest.version}
test
@@ -470,6 +483,20 @@
+
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest
+ test
+
+
+
diff --git a/geowebcache/rest/pom.xml b/geowebcache/rest/pom.xml
index 7863f48ff..d696d8d43 100644
--- a/geowebcache/rest/pom.xml
+++ b/geowebcache/rest/pom.xml
@@ -35,11 +35,6 @@
-
- junit
- junit
- test
-
org.geowebcache
gwc-core
@@ -57,11 +52,6 @@
easymock
test
-
- org.hamcrest
- hamcrest-library
- test
-
org.mockito
mockito-core
diff --git a/geowebcache/s3storage/pom.xml b/geowebcache/s3storage/pom.xml
index 3f05769f5..0d4fc25e6 100644
--- a/geowebcache/s3storage/pom.xml
+++ b/geowebcache/s3storage/pom.xml
@@ -32,11 +32,6 @@
-
- junit
- junit
- test
-
org.mockito
mockito-core
@@ -53,11 +48,6 @@
tests
test
-
- org.hamcrest
- hamcrest-library
- test
-
io.findify
s3mock_2.12
diff --git a/geowebcache/sqlite/pom.xml b/geowebcache/sqlite/pom.xml
index 6bd247850..8eb9f72f8 100644
--- a/geowebcache/sqlite/pom.xml
+++ b/geowebcache/sqlite/pom.xml
@@ -43,16 +43,6 @@
commons-io
commons-io
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-library
- test
-
org.springframework
spring-test
diff --git a/geowebcache/web/pom.xml b/geowebcache/web/pom.xml
index e14aed2e3..f2277c897 100644
--- a/geowebcache/web/pom.xml
+++ b/geowebcache/web/pom.xml
@@ -118,11 +118,6 @@
-
- junit
- junit
- test
-
org.easymock
easymock
@@ -133,11 +128,6 @@
spring-test
test
-
- org.hamcrest
- hamcrest-library
- test
-
org.xmlunit
xmlunit-legacy
diff --git a/geowebcache/wms/pom.xml b/geowebcache/wms/pom.xml
index c542647f8..981a4dce4 100644
--- a/geowebcache/wms/pom.xml
+++ b/geowebcache/wms/pom.xml
@@ -47,11 +47,6 @@
-
- junit
- junit
- test
-
org.mockito
mockito-core
@@ -67,11 +62,6 @@
easymock
test
-
- org.hamcrest
- hamcrest-library
- test
-
org.geowebcache
gwc-core
diff --git a/geowebcache/wmts/pom.xml b/geowebcache/wmts/pom.xml
index 1ca659b5e..a899594f0 100644
--- a/geowebcache/wmts/pom.xml
+++ b/geowebcache/wmts/pom.xml
@@ -26,11 +26,6 @@
-
- junit
- junit
- test
-
org.xmlunit
xmlunit-legacy
@@ -46,17 +41,6 @@
spring-test
test
-
- org.hamcrest
- hamcrest-library
- test
-
-
- org.hamcrest
- hamcrest-integration
- test
-
-