Merge pull request #131 from WeBankFinTech/release/1.5.2

Release/1.5.2
WeBankBlockchain · Feb 23, 2020 · e8941a6 · e8941a6
2 parents b169e80 + 107f18a
commit e8941a6
Show file tree

Hide file tree

Showing 41 changed files with 2,521 additions and 3,007 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,10 +34,10 @@ jobs:
       script:
         - chmod u+x .ci/script/build-ci.sh
         - .ci/script/build-ci.sh
-        - travis_wait 45 ./gradlew check
-        - ./gradlew jacocoTestReport
-      after_success:
-        - bash <(curl -s https://codecov.io/bash)
+        #- travis_wait 45 ./gradlew check
+        #- ./gradlew jacocoTestReport
+      #after_success:
+        #- bash <(curl -s https://codecov.io/bash)
     - stage: "dependency pipeline"
       script:
         - chmod u+x .ci/script/weid-http-service/build-ci.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### V1.5.2 (2020-02-24)
+- Features:
+1. PDF Transportation now forbids content tampering during transportation.
+2. Evidence now returns evidence hash instead of address (see API doc for details).
+3. Evidence creation and query efficiency is greatly improved.
+
+
 ### V1.5.1 (2020-01-22)
 - Features:
 1. Queried CPT can be cached to local machine (require MySQL setup).

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ if (!gradle.startParameter.isOffline()) {
 
 group 'com.webank'
 
-version = "1.5.1"
+version = "1.5.2"
 
 // Specify JDK version - may vary in different scenarios
 sourceCompatibility = 1.8
@@ -128,7 +128,7 @@ dependencies {
     if (gradleVer.startsWith("4")) {
         if (!gradle.startParameter.isOffline()) {
             compile logger, lombok, apache_commons, json, mysql_driver, zxing, rpc, pdfbox, protobuf, caffeine
-            compile("com.webank:weid-contract-java:1.2.12") {
+            compile("com.webank:weid-contract-java:1.2.14") {
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
             compile files("lib/WeDPR-Java-SDK.jar")
@@ -144,7 +144,7 @@ dependencies {
             testAnnotationProcessor 'org.projectlombok:lombok:1.18.10'
             testCompileOnly 'org.projectlombok:lombok:1.18.10'
             compile logger, apache_commons, json, mysql_driver, zxing, rpc, pdfbox, protobuf, caffeine
-            compile("com.webank:weid-contract-java:1.2.12") {
+            compile("com.webank:weid-contract-java:1.2.14") {
                 exclude group: "org.slf4j", module: "slf4j-log4j12"
             }
 			compile files("lib/WeDPR-Java-SDK.jar")