Merge branch '1.5.x'

Author: wilkinsona

spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContent.java

@@ -52,7 +52,15 @@ public JsonContent(Class<?> resourceLoadClass, ResolvableType type, String json)
 		this.json = json;
 	}
 
+	/**
+	 * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat}
+	 * instead.
+	 *
+	 * @deprecated in favor of AssertJ's {@link org.assertj.core.api.Assertions#assertThat
+	 * assertThat}
+	 */
 	@Override
+	@Deprecated
 	public JsonContentAssert assertThat() {
 		return new JsonContentAssert(this.resourceLoadClass, this.json);
 	}