qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [qpid-broker-j] 05/11: QPID-8334: [Broker-J] Upgrade hamcrest dependency to version 2.1
Date Mon, 08 Jul 2019 15:10:16 GMT
This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit b8d953fb535a1b83e60d64c175f697f1b4f838f2
Author: Alex Rudyy <orudyy@apache.org>
AuthorDate: Mon Jul 8 12:28:18 2019 +0100

    QPID-8334: [Broker-J] Upgrade hamcrest dependency to version 2.1
    
    (cherry picked from commit 4c9c4377cdf4ab63b8cce0c32b38ffe383e730c3)
---
 broker-core/pom.xml                            |  2 +-
 pom.xml                                        | 20 ++++++++++++++++----
 systests/protocol-tests-amqp-0-10/pom.xml      |  8 +-------
 systests/protocol-tests-amqp-0-8/pom.xml       |  8 +-------
 systests/protocol-tests-amqp-1-0/pom.xml       |  6 +-----
 systests/protocol-tests-core/pom.xml           | 10 +---------
 systests/qpid-systests-http-management/pom.xml |  8 +-------
 systests/qpid-systests-jms_1.1/pom.xml         |  2 +-
 8 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/broker-core/pom.xml b/broker-core/pom.xml
index 813f015..19a7db8 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 b8a6175..d039da2 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,17 +679,17 @@
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
+        <artifactId>hamcrest</artifactId>
         <version>${hamcrest-version}</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-library</artifactId>
+        <artifactId>hamcrest-core</artifactId>
         <version>${hamcrest-version}</version>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-integration</artifactId>
+        <artifactId>hamcrest-library</artifactId>
         <version>${hamcrest-version}</version>
       </dependency>
       <dependency>
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml b/systests/protocol-tests-amqp-0-10/pom.xml
index 2eeb7d4..17e5e47 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 53b50c2..ff529d0 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 84cd9f2..fd86616 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 f2f3bdd..2b1b317 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 8c907b2..c15fe5b 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 fa39ca7..215278d 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>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message