From 6e3bbe851f971c86c46f24f2d741b2ceb1a7584a Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 13 Jun 2019 19:06:31 +0200 Subject: [PATCH] #1000 - Upgrade to Spring Framework 5.0 M3. --- pom.xml | 2 +- .../hateoas/config/CustomHypermediaWebMvcTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f77f0ef1..7a562f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ 5.4.2 Dysprosium-M1 1.7.26 - 5.2.0.M2 + 5.2.0.M3 2.0.0.M1 1.3.31 diff --git a/src/test/java/org/springframework/hateoas/config/CustomHypermediaWebMvcTest.java b/src/test/java/org/springframework/hateoas/config/CustomHypermediaWebMvcTest.java index bcb37014..29dae89f 100644 --- a/src/test/java/org/springframework/hateoas/config/CustomHypermediaWebMvcTest.java +++ b/src/test/java/org/springframework/hateoas/config/CustomHypermediaWebMvcTest.java @@ -66,7 +66,7 @@ class CustomHypermediaWebMvcTest { void getUsingCustomMediaType() throws Exception { String results = this.mockMvc.perform(get("/employees/1").accept(FRODO_MEDIATYPE)) // - .andExpect(header().string(HttpHeaders.CONTENT_TYPE, FRODO_MEDIATYPE.toString() + ";charset=UTF-8")) // + .andExpect(header().string(HttpHeaders.CONTENT_TYPE, FRODO_MEDIATYPE.toString())) // .andReturn() // .getResponse() // .getContentAsString();