Merge pull request #207 from WeBankBlockchain/release/1.0.28

Release/1.0.28

Author: yanggang-JV

CHANGELOG.md

@@ -1,3 +1,8 @@
+### V1.0.28 (2021-12-11)
+
+* 优化功能:
+1. 升级log4j到2.15.0
+
 ### V1.0.27 (2021-06-10)
 
 * 优化功能:

README.md

@@ -11,6 +11,7 @@ WeIdentity JAVA SDK安装部署工具
 
 | weid-build-tools 版本 | weid-java-sdk 版本 | weid-contract-java 版本 | 备注 |
 | :---- | :---- | :---- | :---- |
+| v1.0.28 | v1.8.3 | v1.2.30 | 升级log4j |
 | v1.0.27 | v1.8.2 | v1.2.30 | - |
 | v1.0.26 | v1.8.1 | v1.2.30 | - |
 | v1.0.25 | v1.8.0 | v1.2.29 | - |

VERSION

@@ -1 +1 @@
-1.0.27
+1.0.28

build.gradle

@@ -65,11 +65,11 @@ List jcommander = [
 ]
 
 List log4j = [
-        "org.apache.logging.log4j:log4j-api:2.13.3",
-        "org.apache.logging.log4j:log4j-web:2.13.3",
-        "org.apache.logging.log4j:log4j-core:2.13.3",
-        "org.apache.logging.log4j:log4j-jcl:2.13.3",
-        "org.apache.logging.log4j:log4j-slf4j-impl:2.13.3",
+        "org.apache.logging.log4j:log4j-api:2.15.0",
+        "org.apache.logging.log4j:log4j-web:2.15.0",
+        "org.apache.logging.log4j:log4j-core:2.15.0",
+        "org.apache.logging.log4j:log4j-jcl:2.15.0",
+        "org.apache.logging.log4j:log4j-slf4j-impl:2.15.0",
         "org.slf4j:jul-to-slf4j:1.7.30",
         "org.slf4j:slf4j-api:1.7.30"
 ]
@@ -132,6 +132,7 @@ dependencies {
             compile("com.webank:weid-java-sdk:${weidSdkVersion}") {
                 exclude group: "org.springframework", module: "*"
                 exclude group: "javax.validation", module: "validation-api"
+                exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
             }
         }
     }
@@ -143,6 +144,7 @@ dependencies {
 			compile("com.webank:weid-java-sdk:${weidSdkVersion}") {
                 exclude group: "org.springframework", module: "*"
                 exclude group: "javax.validation", module: "validation-api"
+                exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
             }
         } else {
             compileOnly files('dist/lib/lombok-1.18.12.jar')

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-weidSdkVersion=1.8.2
+weidSdkVersion=1.8.3
 repoType=cn
 jdkTlsNamedGroups=secp256r1,secp256k1
 signing.keyId=