diff --git a/pom.xml b/pom.xml index 7e6884619..73763ddf3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba fastjson - 1.1.24 + 1.1.25-SNAPSHOT jar fastjson @@ -204,10 +204,10 @@ com.fasterxml.jackson.core jackson-databind - 2.0.4 + 2.1.0 test - + org.codehaus.jackson jackson-core-lgpl @@ -273,7 +273,7 @@ com.google.code.gson gson - 1.6 + 2.2.2 test diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java index 6abf45859..5f049d434 100644 --- a/src/main/java/com/alibaba/fastjson/JSON.java +++ b/src/main/java/com/alibaba/fastjson/JSON.java @@ -644,5 +644,5 @@ public abstract class JSON implements JSONStreamAware, JSONAware { return TypeUtils.cast(json, clazz, ParserConfig.getGlobalInstance()); } - public final static String VERSION = "1.1.22"; + public final static String VERSION = "1.1.25"; }