Upgrade to 4.0.3 and rever code commited in error

spring-attic · Apr 23, 2014 · 92f5393 · 92f5393
1 parent c7b9162
commit 92f5393
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	<version>1.0.0-BUILD-SNAPSHOT</version>
 	<properties>
 		<java-version>1.7</java-version>
-		<org.springframework-version>4.0.1.RELEASE</org.springframework-version>
+		<org.springframework-version>4.0.3.RELEASE</org.springframework-version>
 		<org.springframework.security-version>3.2.0.RELEASE</org.springframework.security-version>
 		<org.aspectj-version>1.7.4</org.aspectj-version>
 		<org.slf4j-version>1.6.1</org.slf4j-version>

diff --git a/...n/java/org/springframework/samples/mvc/messageconverters/MessageConvertersController.java b/...n/java/org/springframework/samples/mvc/messageconverters/MessageConvertersController.java
@@ -69,11 +69,8 @@ public class MessageConvertersController {
 	}
 
 	@RequestMapping(value="/json", method=RequestMethod.GET)
-	public ResponseEntity<JavaBean> writeJson() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.TEXT_PLAIN);
-		return new ResponseEntity<JavaBean>(new JavaBean("bar", "apple"), headers , HttpStatus.OK);
-//		return new JavaBean("bar", "apple");
+	public @ResponseBody JavaBean writeJson() {
+		return new JavaBean("bar", "apple");
 	}
 
 	// AtomFeedHttpMessageConverter (requires Rome on the classpath - useful for serving Atom feeds)