Replace JUnit Hamcrest by the standard Hamcrest dependency

ekino · Jan 21, 2019 · 1dd6c39 · 1dd6c39
1 parent 87e0a92
commit 1dd6c39
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -163,7 +163,7 @@ A JCV module that supports [Hamcrest](https://github.com/hamcrest/JavaHamcrest).
 
 ```java
 import static com.ekino.oss.jcv.assertion.hamcrest.JsonMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.*;
 
 @Test
 void testContainsValidator() throws JSONException {
@@ -188,8 +188,8 @@ Maven
   </dependency>
   <dependency>
     <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-junit</artifactId>
-    <version>2.0.0.0</version>
+    <artifactId>hamcrest</artifactId>
+    <version>2.1</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -207,7 +207,7 @@ Gradle
 dependencies {
   ...
   testImplementation 'org.skyscreamer:jsonassert:1.5.0'
-  testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
+  testImplementation 'org.hamcrest:hamcrest:2.1'
   testImplementation 'com.ekino.oss.jcv:jcv-hamcrest:1.1.0-SNAPSHOT'
   ...
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ allprojects {
         "commons-io.version" to "2.6",
         "jsonassert.version" to "1.5.0",
         "assertj.version" to "3.9.1",
-        "hamcrest-junit.version" to "2.0.0.0",
+        "hamcrest.version" to "2.1",
         "junit-jupiter.version" to "5.2.0",
         "assertk-jvm.version" to "0.12"
     )

diff --git a/jcv-hamcrest/build.gradle.kts b/jcv-hamcrest/build.gradle.kts
@@ -55,14 +55,14 @@ dependencies {
 
     api(project(":jcv-core"))
     implementation(group = "org.skyscreamer", name = "jsonassert", version = "${prop("jsonassert.version")}")
-    implementation(group = "org.hamcrest", name = "hamcrest-junit", version = "${prop("hamcrest-junit.version")}")
+    implementation(group = "org.hamcrest", name = "hamcrest", version = "${prop("hamcrest.version")}")
 
     testImplementation(kotlin("stdlib-jdk8", version = "${prop("kotlin.version")}"))
     testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "${prop("junit-jupiter.version")}")
     testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-params", version = "${prop("junit-jupiter.version")}")
     testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = "${prop("junit-jupiter.version")}")
 
     testImplementation(group = "org.skyscreamer", name = "jsonassert", version = "${prop("jsonassert.version")}")
-    testImplementation(group = "org.hamcrest", name = "hamcrest-junit", version = "${prop("hamcrest-junit.version")}")
+    testImplementation(group = "org.hamcrest", name = "hamcrest", version = "${prop("hamcrest.version")}")
     testImplementation(group = "commons-io", name = "commons-io", version = "${prop("commons-io.version")}")
 }
diff --git a/jcv-hamcrest/src/test/java/com/ekino/oss/jcv/assertion/hamcrest/JsonCompareMatcherTest.java b/jcv-hamcrest/src/test/java/com/ekino/oss/jcv/assertion/hamcrest/JsonCompareMatcherTest.java
@@ -3,17 +3,18 @@
  */
 package com.ekino.oss.jcv.assertion.hamcrest;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
 import com.ekino.oss.jcv.core.validator.Validators;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.ValueMatcherException;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
 import static com.ekino.oss.jcv.assertion.hamcrest.JsonMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 class JsonCompareMatcherTest {