From 565bb7981157732ac275e9adcf6413b7dfa9910a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Sat, 13 Oct 2018 10:43:53 +0200
Subject: [PATCH] Replace jcabi-matchers with hamcrest 2

---
 .../org/shredzone/acme4j/util/CSRBuilderTest.java     |  4 +---
 .../org/shredzone/acme4j/util/KeyPairUtilsTest.java   |  6 ++----
 pom.xml                                               | 11 +++--------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java b/acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
index 5fdac06c..42e61615 100644
--- a/acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
+++ b/acme4j-utils/src/test/java/org/shredzone/acme4j/util/CSRBuilderTest.java
@@ -46,8 +46,6 @@ import org.hamcrest.Description;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.jcabi.matchers.RegexMatchers;
-
 /**
  * Unit tests for {@link CSRBuilder}.
  */
@@ -191,7 +189,7 @@ public class CSRBuilderTest {
         }
 
         // Make sure PEM file is properly formatted
-        assertThat(pem, RegexMatchers.matchesPattern(
+        assertThat(pem, matchesPattern(
                   "-----BEGIN CERTIFICATE REQUEST-----[\\r\\n]+"
                 + "([a-zA-Z0-9/+=]+[\\r\\n]+)+"
                 + "-----END CERTIFICATE REQUEST-----[\\r\\n]*"));
diff --git a/acme4j-utils/src/test/java/org/shredzone/acme4j/util/KeyPairUtilsTest.java b/acme4j-utils/src/test/java/org/shredzone/acme4j/util/KeyPairUtilsTest.java
index 66415927..24b9fa55 100644
--- a/acme4j-utils/src/test/java/org/shredzone/acme4j/util/KeyPairUtilsTest.java
+++ b/acme4j-utils/src/test/java/org/shredzone/acme4j/util/KeyPairUtilsTest.java
@@ -30,8 +30,6 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.jcabi.matchers.RegexMatchers;
-
 /**
  * Unit tests for {@link KeyPairUtils}.
  */
@@ -73,7 +71,7 @@ public class KeyPairUtilsTest {
         }
 
         // Make sure PEM file is properly formatted
-        assertThat(pem, RegexMatchers.matchesPattern(
+        assertThat(pem, matchesPattern(
                   "-----BEGIN RSA PRIVATE KEY-----[\\r\\n]+"
                 + "([a-zA-Z0-9/+=]+[\\r\\n]+)+"
                 + "-----END RSA PRIVATE KEY-----[\\r\\n]*"));
@@ -116,7 +114,7 @@ public class KeyPairUtilsTest {
         }
 
         // Make sure PEM file is properly formatted
-        assertThat(pem, RegexMatchers.matchesPattern(
+        assertThat(pem, matchesPattern(
                   "-----BEGIN EC PRIVATE KEY-----[\\r\\n]+"
                 + "([a-zA-Z0-9/+=]+[\\r\\n]+)+"
                 + "-----END EC PRIVATE KEY-----[\\r\\n]*"));
diff --git a/pom.xml b/pom.xml
index 6e74718c..59d728d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,16 +228,11 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <version>[1.3,)</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jcabi</groupId>
-            <artifactId>jcabi-matchers</artifactId>
-            <version>[1.3,)</version>
+            <artifactId>java-hamcrest</artifactId>
+            <version>[2.0.0.0,)</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>uk.co.datumedge</groupId>
             <artifactId>hamcrest-json</artifactId>