Release 1.2.1

WeBankBlockchain · Dec 15, 2021 · 5f348d2 · 5f348d2
1 parent e9ebc0e
commit 5f348d2
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 19 deletions.
diff --git a/.github/workflows/publish_binary.yml b/.github/workflows/publish_binary.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assemble
     - name: Download plugin
-      run: cd dist/ && bash download_plugin.sh BCOS2 v1.2.0 && bash download_plugin.sh Fabric1 v1.2.0 && bash download_plugin.sh Fabric2 v1.2.0 && bash download_pages.sh v1.2.0  && rm -rf src && cd -
+      run: cd dist/ && bash download_plugin.sh BCOS2 v1.2.1 && bash download_plugin.sh Fabric1 v1.2.1 && bash download_plugin.sh Fabric2 v1.2.1 && bash download_pages.sh v1.2.1  && rm -rf src && cd -
     - name: Pack
       run: chmod +x dist/*.sh && mv dist WeCross && tar -zcvf WeCross.tar.gz WeCross
     - name: Checksum

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,11 @@
+### v1.2.1
+
+(2021-12-15)
+
+**修复**
+
+* 修复log4j的漏洞，将其升级至2.15
+
 ### v1.2.0
 
 (2021-08-20)

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 sourceCompatibility = '1.8'
-version = '1.2.0'
+version = '1.2.1'
 
 task stubSourceJar(type: Jar) {
     into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' }

diff --git a/demo/profile_version.sh b/demo/profile_version.sh
@@ -1,17 +1,17 @@
 # WeCross
-WECROSS_VERSION=v1.2.0
+WECROSS_VERSION=v1.2.1
 # WeCross Console
-WECROSS_CONSOLE_VERSION=v1.2.0
+WECROSS_CONSOLE_VERSION=v1.2.1
 # WeCross Account Manager
-WECROSS_ACCOUNT_MANAGER_VERSION=v1.2.0
+WECROSS_ACCOUNT_MANAGER_VERSION=v1.2.1
 # WeCross BCOS2.0 Stub
-WECROSS_BCOS2_STUB_VERSION=v1.2.0
+WECROSS_BCOS2_STUB_VERSION=v1.2.1
 # WeCross Fabric1.4 Stub
-WECROSS_FABRIC1_STUB_VERSION=v1.2.0
+WECROSS_FABRIC1_STUB_VERSION=v1.2.1
 # WeCross Fabric2.0 Stub
-WECROSS_FABRIC2_STUB_VERSION=v1.2.0
+WECROSS_FABRIC2_STUB_VERSION=v1.2.1
 # WeCross Java SDK
-WECROSS_JAVA_SDK_VERSION=v1.2.0
+WECROSS_JAVA_SDK_VERSION=v1.2.1
 
 # FISCO BCOS
 BCOS_VERSION=v2.7.1

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v1.2.0
+v1.2.1
diff --git a/scripts/download_account_manager.sh b/scripts/download_account_manager.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.2.0 # update this every release
+default_compatibility_version=v1.2.1 # update this every release
 
 compatibility_version=
 enable_build_from_resource=0

diff --git a/scripts/download_console.sh b/scripts/download_console.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.2.0 # update this every release
+default_compatibility_version=v1.2.1 # update this every release
 BCOS_VERSION=v2.7.2  # use this version to specify get_account script
 
 compatibility_version=

diff --git a/scripts/download_demo.sh b/scripts/download_demo.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.2.0 # update this every release
+default_compatibility_version=v1.2.1 # update this every release
 
 compatibility_version=
 

diff --git a/scripts/download_pages.sh b/scripts/download_pages.sh
@@ -28,7 +28,7 @@ Usage:
     bash $0  <tag/branch>
     <tag/branch>:   certain tag or branch to download
 e.g
-    bash $0 v1.2.0
+    bash $0 v1.2.1
 EOF
     exit 0
 }

diff --git a/scripts/download_plugin.sh b/scripts/download_plugin.sh
@@ -41,9 +41,9 @@ Usage:
 
     <tag/branch>:   certain tag or branch to download
 e.g
-    bash $0 BCOS2 v1.2.0
-    bash $0 Fabric1 v1.2.0
-    bash $0 Fabric2 v1.2.0
+    bash $0 BCOS2 v1.2.1
+    bash $0 Fabric1 v1.2.1
+    bash $0 Fabric2 v1.2.1
 EOF
     exit 0
 }

diff --git a/scripts/download_wecross.sh b/scripts/download_wecross.sh
@@ -6,7 +6,7 @@ LANG=en_US.UTF-8
 enable_build_from_resource=0
 compatibility_version=
 
-default_compatibility_version=v1.2.0 # update this every release
+default_compatibility_version=v1.2.1 # update this every release
 deps_dir=$(pwd)'/WeCross/plugin/'
 pages_dir=$(pwd)'/WeCross/pages/'
 src_dir=$(pwd)'/src/'

diff --git a/src/main/java/com/webank/wecross/common/WeCrossDefault.java b/src/main/java/com/webank/wecross/common/WeCrossDefault.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 public class WeCrossDefault {
-    public static final String VERSION = "v1.2.0";
+    public static final String VERSION = "v1.2.1";
 
     public static final String TEMPLATE_URL = "http://127.0.0.1:8080/";