From bee373d6cf007a040476a8f6f1d2b834f4757c40 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 1 Aug 2019 15:19:41 +0200 Subject: [PATCH] Start building against Spring HATEOAS 1.0 snapshots See gh-17755 --- .../hateoas/HypermediaAutoConfigurationTests.java | 3 +-- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java index fb01614960..1d02e4306a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java @@ -121,8 +121,7 @@ class HypermediaAutoConfigurationTests { RequestMappingHandlerAdapter handlerAdapter = this.context.getBean(RequestMappingHandlerAdapter.class); for (HttpMessageConverter converter : handlerAdapter.getMessageConverters()) { if (converter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) { - assertThat(converter.getSupportedMediaTypes()).containsExactly(MediaTypes.HAL_JSON, - MediaTypes.HAL_JSON_UTF8); + assertThat(converter.getSupportedMediaTypes()).containsExactly(MediaTypes.HAL_JSON); } } } diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index bfbb85a388..a7146334dc 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -184,7 +184,7 @@ 2.0.6.RELEASE Moore-BUILD-SNAPSHOT 5.2.0.BUILD-SNAPSHOT - 1.0.0.M3 + 1.0.0.BUILD-SNAPSHOT 5.2.0.BUILD-SNAPSHOT 2.3.0.BUILD-SNAPSHOT 2.3.2.RELEASE