Merge pull request #3136 from kiddingYang/master

fix #3135

src/test/java/com/alibaba/json/bvt/SqlTimestampTest.java

@@ -3,9 +3,7 @@ package com.alibaba.json.bvt;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import junit.framework.TestCase;
-import org.junit.Assert;
 
-import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -13,8 +11,8 @@ import java.util.TimeZone;
 public class SqlTimestampTest
         extends TestCase {
     protected void setUp() throws Exception {
-        JSON.defaultTimeZone = TimeZone.getTimeZone("Asia/Shanghai");
-        JSON.defaultLocale = new Locale("zh_CN");
+        JSON.defaultTimeZone = TimeZone.getDefault();
+        JSON.defaultLocale = Locale.getDefault();
     }
     
     public void test_date() throws Exception {