Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #621 from royclarkson/Gson_2_3

Browse Source 
Upgrade to Gson 2.3
This commit is contained in:
Juergen Hoeller
2014-08-12 10:52:33 +02:00
parent 01cbf9b9ee d6fd40d6dc
commit 29cb7808f2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -34,7 +34,7 @@ configure(allprojects) { project ->
ext.hibVal5Version = "5.1.2.Final" ext.hibVal5Version = "5.1.2.Final"
ext.hsqldbVersion = "2.3.2" ext.hsqldbVersion = "2.3.2"
ext.jackson2Version = "2.4.1" ext.jackson2Version = "2.4.1"
ext.gsonVersion = "2.2.4" ext.gsonVersion = "2.3"
ext.jasperReportsVersion = "5.6.0" ext.jasperReportsVersion = "5.6.0"
ext.jettyVersion = "9.2.2.v20140723" ext.jettyVersion = "9.2.2.v20140723"
ext.jodaVersion = "2.4" ext.jodaVersion = "2.4"

2
spring-web/src/main/java/org/springframework/http/converter/json/GsonHttpMessageConverter.java
View File

@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
* <p>This converter can be used to bind to typed beans or untyped {@code HashMap}s. * <p>This converter can be used to bind to typed beans or untyped {@code HashMap}s.
* By default, it supports {@code application/json} and {@code application/*+json}. * By default, it supports {@code application/json} and {@code application/*+json}.
* *
* <p>Tested against Gson 2.2; compatible with Gson 2.0 and higher. * <p>Tested against Gson 2.3; compatible with Gson 2.0 and higher.
* *
* @author Roy Clarkson * @author Roy Clarkson
* @since 4.1 * @since 4.1