You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2020/08/18 17:50:48 UTC

[cxf] 01/02: Upgrade hamcrest version

This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit d2ec5b8a5e568e79e0c423c7c4d063a99283e65c
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Tue Aug 18 12:33:21 2020 -0400

    Upgrade hamcrest version
---
 integration/spring-boot/autoconfigure/pom.xml |  5 +++++
 parent/pom.xml                                |  8 +++++++-
 systests/cdi/base/pom.xml                     | 12 +++++++++++-
 systests/rs-sse/rs-sse-base/pom.xml           | 10 ++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index 9ebd02e..e44ae6c 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -115,6 +115,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>${cxf.spring.mock}</artifactId>
             <scope>test</scope>
diff --git a/parent/pom.xml b/parent/pom.xml
index 27a52b5..2065b3b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
         <cxf.geronimo.openapi.version>1.0.12</cxf.geronimo.openapi.version>
         <cxf.glassfish.json.version>1.1.4</cxf.glassfish.json.version>
         <cxf.guava.version>29.0-jre</cxf.guava.version>
-        <cxf.hamcrest.version>1.3</cxf.hamcrest.version>
+        <cxf.hamcrest.version>2.2</cxf.hamcrest.version>
         <cxf.hazelcast.version>3.12.7</cxf.hazelcast.version>
         <cxf.hibernate.em.version>5.4.19.Final</cxf.hibernate.em.version>
         <cxf.hibernate.validator.version>6.1.4.Final</cxf.hibernate.validator.version>
@@ -816,6 +816,12 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>${cxf.hamcrest.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
                 <version>4.0.3</version>
diff --git a/systests/cdi/base/pom.xml b/systests/cdi/base/pom.xml
index eea04cf..9d5f34e 100644
--- a/systests/cdi/base/pom.xml
+++ b/systests/cdi/base/pom.xml
@@ -67,6 +67,16 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
         </dependency>
@@ -87,4 +97,4 @@
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml
index 017629b..5013775 100644
--- a/systests/rs-sse/rs-sse-base/pom.xml
+++ b/systests/rs-sse/rs-sse-base/pom.xml
@@ -41,6 +41,16 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>