Updgrade to Spring 4.0.3

donguklee · Mar 28, 2014 · 5819960 · 5819960
1 parent 5645773
commit 5819960
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -16,8 +16,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>4.0.2.RELEASE</spring.version>
-    <spring.security.version>3.2.2.RELEASE</spring.security.version>
+    <spring.version>4.0.3.RELEASE</spring.version>
+    <spring.security.version>3.2.3.RELEASE</spring.security.version>
     <java.version>1.6</java.version>
   </properties>
 

diff --git a/samples/oauth2/sparklr/pom.xml b/samples/oauth2/sparklr/pom.xml
@@ -159,9 +159,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.9.13</version>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.3.1</version>
 		</dependency>
 
 		<dependency>

diff --git a/...rc/main/java/org/springframework/security/oauth/examples/sparklr/config/WebMvcConfig.java b/...rc/main/java/org/springframework/security/oauth/examples/sparklr/config/WebMvcConfig.java
@@ -27,7 +27,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
-import org.springframework.web.servlet.view.json.MappingJacksonJsonView;
+import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 @Configuration
 @EnableWebMvc
@@ -47,12 +47,11 @@ public ContentNegotiatingViewResolver contentViewResolver() throws Exception {
         viewResolver.setPrefix("/WEB-INF/jsp/");
         viewResolver.setSuffix(".jsp");
 
-        MappingJacksonJsonView defaultView = new MappingJacksonJsonView();
+        MappingJackson2JsonView defaultView = new MappingJackson2JsonView();
         defaultView.setExtractValueFromSingleKeyModel(true);
 
         ContentNegotiatingViewResolver contentViewResolver = new ContentNegotiatingViewResolver();
         contentViewResolver.setContentNegotiationManager(contentNegotiationManager.getObject());
-        contentViewResolver.setDefaultViews(Arrays.<View>asList(new MappingJacksonJsonView()));
         contentViewResolver.setViewResolvers(Arrays.<ViewResolver>asList(viewResolver));
         contentViewResolver.setDefaultViews(Arrays.<View>asList(defaultView));
         return contentViewResolver;

diff --git a/spring-security-oauth/src/test/resources/data.sql b/spring-security-oauth/src/test/resources/data.sql
@@ -0,0 +1 @@
+select * from oauth_client_details;
diff --git a/spring-security-oauth2/src/test/resources/data.sql b/spring-security-oauth2/src/test/resources/data.sql
@@ -0,0 +1 @@
+select * from oauth_client_details;