QPID-8334: [Broker-J] Upgrade hamcrest dependency to version 2.1
diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 381faeb..4eb2946 100644
--- a/broker-core/pom.xml
+++ b/broker-core/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index c2946f4..ebe4805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<junit-version>4.11</junit-version>
<mockito-version>2.22.0</mockito-version>
<netty-version>4.1.32.Final</netty-version>
- <hamcrest-version>1.3</hamcrest-version>
+ <hamcrest-version>2.1</hamcrest-version>
<maven-core-version>3.5.4</maven-core-version>
<maven-resolver-version>1.1.1</maven-resolver-version>
<httpclient-version>4.5.3</httpclient-version>
@@ -207,6 +207,18 @@
<dependencies>
<dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -667,6 +679,11 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${hamcrest-version}</version>
</dependency>
@@ -676,11 +693,6 @@
<version>${hamcrest-version}</version>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
- <version>${hamcrest-version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven-core-version}</version>
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index 27a3bc2..4c1e3f1 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -78,13 +78,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml b/systests/protocol-tests-amqp-0-8/pom.xml
index 26ffb8d..4abae83 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -78,13 +78,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index 4b00ec3..be89f65 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -103,11 +103,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
+ <artifactId>hamcrest</artifactId>
</dependency>
</dependencies>
diff --git a/systests/protocol-tests-core/pom.xml b/systests/protocol-tests-core/pom.xml
index b4b238d..a7c573f 100644
--- a/systests/protocol-tests-core/pom.xml
+++ b/systests/protocol-tests-core/pom.xml
@@ -60,15 +60,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
+ <artifactId>hamcrest</artifactId>
</dependency>
</dependencies>
diff --git a/systests/qpid-systests-http-management/pom.xml b/systests/qpid-systests-http-management/pom.xml
index 2c49864..de83e47 100644
--- a/systests/qpid-systests-http-management/pom.xml
+++ b/systests/qpid-systests-http-management/pom.xml
@@ -101,13 +101,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-integration</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/systests/qpid-systests-jms_1.1/pom.xml b/systests/qpid-systests-jms_1.1/pom.xml
index 71376ff..be9fa90 100644
--- a/systests/qpid-systests-jms_1.1/pom.xml
+++ b/systests/qpid-systests-jms_1.1/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
