From fddda443a2b8d2b4b7bd6516a5ba63ca8dc943df Mon Sep 17 00:00:00 2001
From: James <jamesagnew@gmail.com>
Date: Wed, 11 Oct 2017 06:33:15 -0400
Subject: [PATCH] Remove hamcrest-date library that caused conflicts

---
 hapi-fhir-jpaserver-base/pom.xml                          | 7 +------
 .../fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java | 8 +++-----
 pom.xml                                                   | 5 -----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index f834bba56e1..9bc78bd71ff 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -125,11 +125,6 @@
 			<artifactId>datasource-proxy</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.exparity</groupId>
-			<artifactId>hamcrest-date</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.javassist</groupId>
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
index bebd33aef62..1792f9fe300 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
@@ -8,7 +8,6 @@ import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.client.interceptor.CapturingInterceptor;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.util.TestUtil;
-import org.exparity.hamcrest.date.DateMatchers;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.After;
@@ -19,8 +18,7 @@ import org.springframework.test.util.AopTestUtils;
 import java.io.IOException;
 import java.util.Date;
 
-import static org.hamcrest.Matchers.blankOrNullString;
-import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.*;
 
@@ -166,8 +164,8 @@ public class ResourceProviderR4CacheTest extends BaseResourceProviderR4Test {
 		assertEquals(1, results1.getEntry().size());
 		assertEquals(1, mySearchEntityDao.count());
 		assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
-		assertThat(results1.getMeta().getLastUpdated(), DateMatchers.after(beforeFirst));
-		assertThat(results1.getMeta().getLastUpdated(), DateMatchers.before(new Date()));
+		assertThat(results1.getMeta().getLastUpdated(), greaterThan(beforeFirst));
+		assertThat(results1.getMeta().getLastUpdated(), lessThan(new Date()));
 		assertThat(results1.getId(), not(blankOrNullString()));
 
 		Patient pt2 = new Patient();
diff --git a/pom.xml b/pom.xml
index dea73eb5a84..b4c2c1b6367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -808,11 +808,6 @@
 				<artifactId>websocket-server</artifactId>
 				<version>${jetty_version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.exparity</groupId>
-				<artifactId>hamcrest-date</artifactId>
-				<version>2.0.4</version>
-			</dependency>
 			<dependency>
 				<groupId>org.fusesource.jansi</groupId>
 				<artifactId>jansi</artifactId>