diff --git a/pom.xml b/pom.xml index 2507e155ee..18d8f3c8e9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba fastjson - 1.2.80 + 1.2.83 jar fastjson @@ -14,9 +14,8 @@ 2012 - 4.13.1 - true - true + false + false UTF-8 1.5 @@ -125,7 +124,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.0 attach-sources @@ -142,7 +140,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 **/bvt/**/*.java @@ -151,9 +148,7 @@ - org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 attach-javadoc @@ -175,9 +170,7 @@ - org.apache.maven.plugins maven-gpg-plugin - 1.6 ${gpg.skip} @@ -319,355 +312,5 @@ 0.36 provided - - - com.google.protobuf - protobuf-java - 3.11.0 - provided - - - com.google.protobuf - protobuf-java-util - 3.11.0 - provided - - - - org.jacoco - jacoco-maven-plugin - 0.7.6.201602180812 - provided - - - - org.eclipse.jetty - jetty-server - 9.4.17.v20190418 - test - true - - - org.eclipse.jetty - jetty-webapp - 9.4.17.v20190418 - test - true - - - - junit - junit - ${junit.version} - test - - - - com.fasterxml.jackson.core - jackson-databind - 2.10.0 - test - - - com.fasterxml.jackson.module - jackson-module-afterburner - 2.10.0 - test - - - com.fasterxml.jackson.module - jackson-module-kotlin - 2.9.10 - test - - - - cglib - cglib-nodep - 2.2.2 - test - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.9.10 - test - - - com.googlecode.json-simple - json-simple - 1.1.1 - test - - - - commons-io - commons-io - 2.7 - test - - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - test - - - - com.google.code.gson - gson - 2.6.2 - test - - - net.minidev - json-smart - 2.4.8 - test - - - - org.clojure - clojure - 1.5.1 - test - - - org.codehaus.groovy - groovy - 2.1.5 - test - - - - org.springframework - spring-test - 4.3.7.RELEASE - test - - - org.javassist - javassist - 3.18.0-GA - test - - - - org.apache.cxf - cxf-rt-rs-client - 3.1.2 - test - - - - org.springframework.data - spring-data-commons - 2.1.2.RELEASE - test - - - - org.glassfish.jersey.containers - jersey-container-servlet - 2.23.2 - test - - - org.glassfish.jersey.core - jersey-client - 2.23.2 - test - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-jdk-http - 2.23.2 - test - - - org.glassfish.jersey.media - jersey-media-json-jackson - 2.23.2 - test - - - com.jsoniter - jsoniter - 0.9.8 - test - - - - org.apache.commons - commons-lang3 - 3.5 - test - - - - org.hibernate - hibernate-core - 5.2.10.Final - test - - - - com.jayway.jsonpath - json-path - 2.3.0 - test - - - - org.jetbrains.kotlin - kotlin-stdlib - 1.4.21 - test - - - - org.jetbrains.kotlin - kotlin-reflect - 1.4.21 - test - - - - org.springframework.security - spring-security-web - 5.2.10.RELEASE - test - - - - org.apache.commons - commons-collections4 - 4.1 - test - - - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.6 - test - - - com.diffblue - deeptestutils - 1.1.0 - test - - - - org.projectlombok - lombok - 1.18.4 - test - - - - org.openjdk.jmh - jmh-core - 1.21 - test - - - org.openjdk.jmh - jmh-generator-annprocess - 1.21 - test - - - - - org.springframework.security.oauth - spring-security-oauth2 - 2.3.5.RELEASE - - - commons-codec - commons-codec - - - jackson - jackson-mapper-asl - - - jackson - jackson-core-asl - - - test - - - - org.gitlab4j - gitlab4j-api - 4.8.42 - test - - - - org.json - json - 20180130 - test - - - - com.chinamobile.cmos - sms-core - 2.1.9 - test - - - - - github_actions - - - env.GITHUB_ACTIONS - true - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.7 - - - - prepare-agent - - - - report - test - - report - - - - - - - - - diff --git a/src/main/java/com/alibaba/fastjson/JSON.java b/src/main/java/com/alibaba/fastjson/JSON.java index 260d9ce045..1a94647148 100644 --- a/src/main/java/com/alibaba/fastjson/JSON.java +++ b/src/main/java/com/alibaba/fastjson/JSON.java @@ -1421,5 +1421,5 @@ public static Type getMixInAnnotations(Type target) { return null; } - public final static String VERSION = "1.2.76"; + public final static String VERSION = "1.2.83"; }