Browse Source

fastjson version update to 1.2.83

lijie 2 years ago
parent
commit
41a8a5059e
4 changed files with 8 additions and 5 deletions
  1. 2 1
      data-core/build.gradle
  2. 1 1
      gradle.properties
  3. 2 1
      old-data-core/build.gradle
  4. 3 2
      scheduler/build.gradle

+ 2 - 1
data-core/build.gradle

@@ -75,7 +75,8 @@ dependencies {
     compile group: "com.persagy", name: "persagy-kotlin-database", version: PERSAGY_KOTLIN_VERSION
     compile group: "com.persagy", name: "persagy-kotlin-mybatis", version: PERSAGY_KOTLIN_VERSION
     compile group: "com.persagy", name: "persagy-kotlin-postgresql", version: PERSAGY_KOTLIN_VERSION
-    compile group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION
+    compile(group: "com.persagy", name: "persagy-service-base", version: PERSAGY_SERVICE_VERSION_LAST) {exclude group: 'com.alibaba',module:'fastjson'}
+    compile group: "com.alibaba", name: "fastjson", version: FAST_JSON_VERSION
     compile group: "com.persagy", name: "persagy-service-mybatis", version: PERSAGY_SERVICE_VERSION
 
     //Gson

+ 1 - 1
gradle.properties

@@ -64,7 +64,7 @@ MYBATIS_VERSION=1.3.2
 # https://mvnrepository.com/artifact/mysql/mysql-connector-java
 MYSQL_VERSION=8.0.12
 # https://mvnrepository.com/artifact/com.alibaba/fastjson
-FAST_JSON_VERSION=1.2.75
+FAST_JSON_VERSION=1.2.83
 # https://mvnrepository.com/artifact/com.alibaba/fastjson
 MYBATIS_CORE_VERSION=3.5.6
 # mybatis_plus

+ 2 - 1
old-data-core/build.gradle

@@ -62,7 +62,8 @@ dependencies {
     compile group: "cn.sagacloud", name: "saga-kotlin-base", version: SAGA_KOTLIN_VERSION
     compile group: "cn.sagacloud", name: "saga-kotlin-database", version: SAGA_KOTLIN_VERSION
     compile group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SAGA_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-base", version: SAGA_SERVICE_VERSION
+    compile(group: "cn.sagacloud", name: "saga-service-base", version: SYBOTAN_SERVICE_VERSION) {exclude group: 'com.alibaba',module:'fastjson'}
+    compile group: "com.alibaba", name: "fastjson", version: FAST_JSON_VERSION
     compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SAGA_SERVICE_VERSION
 
     //Gson

+ 3 - 2
scheduler/build.gradle

@@ -90,7 +90,7 @@ dependencies {
     compile(group: "cn.sagacloud", name: "saga-kotlin-mybatis", version: SYBOTAN_KOTLIN_VERSION) {exclude group: 'org.mybatis',module:'mybatis'}
     compile group: "org.mybatis", name: "mybatis", version: MYBATIS_CORE_VERSION
     compile group: "cn.sagacloud", name: "saga-kotlin-mysql", version: SYBOTAN_KOTLIN_VERSION
-    compile group: "cn.sagacloud", name: "saga-service-base", version: SYBOTAN_SERVICE_VERSION
+    compile(group: "cn.sagacloud", name: "saga-service-base", version: SYBOTAN_SERVICE_VERSION) {exclude group: 'com.alibaba',module:'fastjson'}
     compile group: "cn.sagacloud", name: "saga-service-mybatis", version: SYBOTAN_SERVICE_VERSION
     compile group: "cn.sagacloud", name: "saga-service-mysql", version: SYBOTAN_SERVICE_VERSION
 
@@ -118,7 +118,8 @@ dependencies {
     // https://mvnrepository.com/artifact/log4j/log4j
     compile group: 'log4j', name: 'log4j', version: '1.2.17'
     // https://mvnrepository.com/artifact/com.alibaba/fastjson
-    compile group: 'com.alibaba', name: 'fastjson', version: '1.2.75'
+
+    compile group: "com.alibaba", name: "fastjson", version: FAST_JSON_VERSION
 
     compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.25'