From bd942a35fbf90739b19b5d1e292bed63cfc0a865 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 1 Sep 2015 15:11:01 +0200 Subject: [PATCH] Fix upgrade to Spring Data Gosling RELEASE Closes gh-3860 --- .../autoconfigure/hateoas/HypermediaAutoConfiguration.java | 4 ++-- spring-boot-dependencies/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index b3c1fff2e47..8c66a5c90e8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014 the original author or authors. + * Copyright 2012-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,7 +101,7 @@ public class HypermediaAutoConfiguration { objectMapper.registerModule(new Jackson2HalModule()); Jackson2HalModule.HalHandlerInstantiator instantiator = new Jackson2HalModule.HalHandlerInstantiator( HalObjectMapperConfiguration.this.relProvider, - HalObjectMapperConfiguration.this.curieProvider); + HalObjectMapperConfiguration.this.curieProvider, null); objectMapper.setHandlerInstantiator(instantiator); } diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index cddba91e95f..ec16f6748e7 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -130,7 +130,7 @@ 1.2.0.RELEASE 3.0.5.RELEASE Gosling-RELEASE - 0.18.0.RELEASE + 0.19.0.RELEASE 4.2.0.RC1 1.2.4.RELEASE 1.1.5.RELEASE