From 5f4abe70f3ce3bd9916bfb87f4d223647344277e Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <ogierke@pivotal.io>
Date: Thu, 20 Dec 2018 17:17:17 +0100
Subject: [PATCH] DATAREST-1325 - Upgrade Hibernate dependency to 5.2.17.

---
 pom.xml                                                        | 2 +-
 spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml      | 2 +-
 .../webmvc/json/Jackson2DatatypeHelperIntegrationTests.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93661de5a..527776d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 		<springdata.keyvalue>2.2.0.BUILD-SNAPSHOT</springdata.keyvalue>
 		<spring-hateoas>0.25.0.RELEASE</spring-hateoas>
 
-		<hibernate.version>4.3.10.Final</hibernate.version>
+		<hibernate.version>5.2.17.Final</hibernate.version>
 		<jsonpath>1.1.0</jsonpath>
 		<bundlor.enabled>false</bundlor.enabled>
 	</properties>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
index 0942e9d4e..6d8ac69b9 100644
--- a/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
+++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
@@ -51,7 +51,7 @@
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-hibernate4</artifactId>
+			<artifactId>jackson-datatype-hibernate5</artifactId>
 		</dependency>
 
 		<dependency>
diff --git a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java
index 50fec4a2a..9a5a02ce6 100755
--- a/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java
+++ b/spring-data-rest-tests/spring-data-rest-tests-jpa/src/test/java/org/springframework/data/rest/webmvc/json/Jackson2DatatypeHelperIntegrationTests.java
@@ -79,7 +79,8 @@ public class Jackson2DatatypeHelperIntegrationTests {
 
 		PersistentEntity<?, ?> entity = entities.getRequiredPersistentEntity(Order.class);
 		PersistentProperty<?> property = entity.getRequiredPersistentProperty("creator");
-		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(orders.findById(this.order.getId()).orElse(null));
+		PersistentPropertyAccessor<?> accessor = entity
+				.getPropertyAccessor(orders.findById(this.order.getId()).orElse(null));
 
 		assertThat(objectMapper.writeValueAsString(accessor.getProperty(property))).isNotEqualTo("null");
 	}