Merge pull request #198 from WeBankFinTech/master

Merge back to develop
WeBankBlockchain · May 8, 2020 · 578554b · 578554b
2 parents 6dc4f87 + 0e45e94
commit 578554b
Show file tree

Hide file tree

Showing 17 changed files with 1,316 additions and 1,075 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,18 +44,18 @@ jobs:
         - .ci/script/weid-http-service/build-ci.sh
       name: "HTTP Rest Service simple CI"
       if: (branch = master)
-    - stage: "dependency pipeline"
-      script:
-        - chmod u+x .ci/script/weid-build-tools/build-ci.sh
-        - .ci/script/weid-build-tools/build-ci.sh
-      name: "Build Tools simple CI"
-      if: (branch = master)
     - stage: "dependency pipeline"
       script:
         - chmod +x .ci/script/weid-sample/build-ci.sh
         - .ci/script/weid-sample/build-ci.sh
       name: "Sample simple CI"
       if: (branch = master)
+#    - stage: "dependency pipeline"
+#      script:
+#        - chmod u+x .ci/script/weid-build-tools/build-ci.sh
+#        - .ci/script/weid-build-tools/build-ci.sh
+#      name: "Build Tools simple CI"
+#      if: (branch = master)
 
 deploy:
   provider: releases

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
-### V1.6.2
+### V1.6.2 (2020-05-07)
+- Features:
+1. CryptoService, built-in support for ECIES and RSA encryption and decryption.
+2. Support delegate creation and modification of WeID.
+3. Lite Credential support, a light-weight portable format which uses Secp256k1 universal signature.
+4. Support Offline verification of Credential.
+5. Allow customize public key types for WeID e.g. RSA public keys.
+
 - Bugfixes:
 1. Fix a DB Connection Pool initialization issue.
+2. Fix a hash conflict issue in offline Evidence transactions.
+3. Allow long blockchain operations correctly timed-out.
+4. Fix an issue where credential's hash generation contains escape characters in inner Claim json.
 
 ### V1.6.1 (2020-04-12)
 - Features:

diff --git a/build.gradle b/build.gradle
@@ -144,7 +144,7 @@ dependencies {
                 exclude group: "org.fisco-bcos", module: "web3sdk"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
-            compile("org.fisco-bcos:web3sdk:2.4.0-0423-SNAPSHOT")
+            compile("org.fisco-bcos:web3sdk:2.4.0")
             compile fileTree(dir: 'lib', include: '*.jar')
             testCompile logger, lombok, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval
         } else {
@@ -162,7 +162,7 @@ dependencies {
                 exclude group: "org.fisco-bcos", module: "web3sdk"
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
-            compile("org.fisco-bcos:web3sdk:2.4.0-0423-SNAPSHOT")
+            compile("org.fisco-bcos:web3sdk:2.4.0")
 			compile fileTree(dir: 'lib', include: '*.jar')
             testCompile logger, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval
         } else {