Move hamcrest dependency to the parent, upgrade it to 2.2 (OpenFeign#…

…1476) * Move hamcrest dependency to the parent, upgrade it to 2.2 * hamcrest-library is deprecated * organise properties in parent: move the hamcrest version next to other test tools
kistlers · Aug 4, 2021 · ebd8eee · ebd8eee
1 parent c88b65a
commit ebd8eee
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 39 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <hamcrest.version>1.3</hamcrest.version>
   </properties>
 
   <dependencies>
@@ -67,8 +66,7 @@
 
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${hamcrest.version}</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/dropwizard-metrics4/pom.xml b/dropwizard-metrics4/pom.xml
@@ -46,8 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>java-hamcrest</artifactId>
-      <version>2.0.0.0</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/dropwizard-metrics5/pom.xml b/dropwizard-metrics5/pom.xml
@@ -46,8 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>java-hamcrest</artifactId>
-      <version>2.0.0.0</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml
@@ -98,8 +98,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>java-hamcrest</artifactId>
-      <version>2.0.0.0</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/json/pom.xml b/json/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-    <hamcrest.version>1.3</hamcrest.version>
     <mockito.version>1.10.19</mockito.version>
   </properties>
 
@@ -44,14 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>${hamcrest.version}</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -46,8 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>java-hamcrest</artifactId>
-      <version>2.0.0.0</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/mock/pom.xml b/mock/pom.xml
@@ -29,8 +29,6 @@
 
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
-
-    <hamcrest.version>1.3</hamcrest.version>
   </properties>
 
   <dependencies>
@@ -46,14 +44,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>${hamcrest.version}</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -85,6 +85,7 @@
     <junit.version>4.13.1</junit.version>
     <jackson.version>2.12.4</jackson.version>
     <assertj.version>3.10.0</assertj.version>
+    <hamcrest.version>2.2</hamcrest.version>
 
     <animal-sniffer-maven-plugin.version>1.17</animal-sniffer-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
@@ -285,6 +286,12 @@
         <version>${junit.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>${hamcrest.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.jvnet</groupId>
         <artifactId>animal-sniffer-annotation</artifactId>

diff --git a/spring4/pom.xml b/spring4/pom.xml
@@ -31,7 +31,6 @@
     <main.basedir>${project.basedir}/..</main.basedir>
 
     <spring.version>4.3.6.RELEASE</spring.version>
-    <hamcrest.version>1.3</hamcrest.version>
   </properties>
 
   <dependencies>
@@ -58,14 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>${hamcrest.version}</version>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>