From c118a4d1eb4de30ebfc9027e3b3d3de793a91479 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Tue, 20 Aug 2019 13:41:18 -0500
Subject: [PATCH] Drop UTF8 charset extension.

---
 .../hateoas/examples/EmployeeControllerTests.java         | 2 +-
 pom.xml                                                   | 8 ++++----
 .../hateoas/examples/EmployeeControllerTests.java         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/basics/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java b/basics/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
index 1cbfafd..36a7e32 100644
--- a/basics/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
+++ b/basics/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
@@ -59,7 +59,7 @@ public class EmployeeControllerTests {
 		mvc.perform(get("/employees").accept(MediaTypes.HAL_JSON_VALUE)) //
 				.andDo(print()) //
 				.andExpect(status().isOk()) //
-				.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE + ";charset=UTF-8"))
+				.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE))
 				.andExpect(jsonPath("$._embedded.employees[0].id", is(1)))
 				.andExpect(jsonPath("$._embedded.employees[0].firstName", is("Frodo")))
 				.andExpect(jsonPath("$._embedded.employees[0].lastName", is("Baggins")))
diff --git a/pom.xml b/pom.xml
index 3f2bcbc..5f1e097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.2.0.M5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -72,8 +72,8 @@
 		<java.version>1.8</java.version>
 
 		<evo.version>1.2.2</evo.version>
-		<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
-		<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
+		<!--<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>-->
+		<!--<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>-->
 	</properties>
 
 	<profiles>
@@ -90,7 +90,7 @@
 				</repository>
 			</repositories>
 		</profile>
-		
+
 	</profiles>
 
 	<developers>
diff --git a/simplified/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java b/simplified/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
index 49576a2..e42cf47 100644
--- a/simplified/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
+++ b/simplified/src/test/java/org/springframework/hateoas/examples/EmployeeControllerTests.java
@@ -57,7 +57,7 @@ public class EmployeeControllerTests {
 		mvc.perform(get("/employees").accept(MediaTypes.HAL_JSON_VALUE)) //
 				.andDo(print()) //
 				.andExpect(status().isOk()) //
-				.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_UTF8_VALUE))
+				.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaTypes.HAL_JSON_VALUE))
 				.andExpect(jsonPath("$._embedded.employees[0].id", is(1)))
 				.andExpect(jsonPath("$._embedded.employees[0].firstName", is("Frodo")))
 				.andExpect(jsonPath("$._embedded.employees[0].lastName", is("Baggins")))