<fix>(project): upgrade project spring, bouncycastle deps version. (#211

)
WeBankBlockchain · Feb 23, 2024 · 47ef05e · 47ef05e
1 parent 3578146
commit 47ef05e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/.ci/ci_check.sh b/.ci/ci_check.sh
@@ -3,14 +3,22 @@ set -e
 
 # gradle build check
 bash gradlew build
-
+get_sed_cmd()
+{
+  local sed_cmd="sed -i"
+  if [ "$(uname)" == "Darwin" ];then
+        sed_cmd="sed -i .bkp"
+  fi
+  echo "$sed_cmd"
+}
+sed_cmd=$(get_sed_cmd)
 # Non SM node test
 echo " Not SM NODE ============>>>> "
 echo " Not SM NODE ============>>>> "
 echo " Not SM NODE ============>>>> "
 
 # download build_chain.sh to build fisco-bcos block chain
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
 echo "127.0.0.1:4 agency1 1,2,3" > ipconf
 bash build_chain.sh -f ipconf
 ./nodes/127.0.0.1/fisco-bcos -v
@@ -42,7 +50,7 @@ echo " SM NODE ============>>>> "
 echo " SM NODE ============>>>> "
 
 # download build_chain.sh to build fisco-bcos block chain
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
 echo "127.0.0.1:4 agency1 1,2,3" > ipconf
 bash build_chain.sh -f ipconf -g
 ./nodes/127.0.0.1/fisco-bcos -v
@@ -53,7 +61,7 @@ bash nodes/127.0.0.1/start_all.sh
 mkdir -p src/integTest/resources/chains/bcos
 cp -r nodes/127.0.0.1/sdk/* src/integTest/resources/chains/bcos
 cp src/test/resources/stub.toml src/integTest/resources/chains/bcos/
-sed -i.bak 's/BCOS2/GM_BCOS2/g' src/integTest/resources/chains/bcos/stub.toml
+${sed_cmd} 's/BCOS2/GM_BCOS2/g' src/integTest/resources/chains/bcos/stub.toml
 
 cat src/integTest/resources/chains/bcos/stub.toml
 mkdir -p src/integTest/resources/accounts
@@ -76,7 +84,7 @@ echo " SM NODE, SM SSL============>>>> "
 echo " SM NODE, SM SSL============>>>> "
 
 # download build_chain.sh to build fisco-bcos block chain
-curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.9.1/build_chain.sh && chmod u+x build_chain.sh
+curl -LO https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.10.1/build_chain.sh && chmod u+x build_chain.sh
 echo "127.0.0.1:4 agency1 1,2,3" > ipconf
 bash build_chain.sh -f ipconf -g -G
 ./nodes/127.0.0.1/fisco-bcos -v
@@ -87,7 +95,8 @@ bash nodes/127.0.0.1/start_all.sh
 mkdir -p src/integTest/resources/chains/bcos
 cp -r nodes/127.0.0.1/sdk/* src/integTest/resources/chains/bcos
 cp src/test/resources/stub.toml src/integTest/resources/chains/bcos/
-sed -i.bak -e 's/BCOS2/GM_BCOS2/g' -e 's/gmConnectEnable = false/gmConnectEnable = true/g' src/integTest/resources/chains/bcos/stub.toml
+${sed_cmd} -e 's/BCOS2/GM_BCOS2/g' src/integTest/resources/chains/bcos/stub.toml
+${sed_cmd} -e 's/gmConnectEnable = false/gmConnectEnable = true/g' src/integTest/resources/chains/bcos/stub.toml
 
 cat src/integTest/resources/chains/bcos/stub.toml
 mkdir -p src/integTest/resources/accounts

diff --git a/.github/workflows/ci_check.yml b/.github/workflows/ci_check.yml
@@ -12,6 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-latest]
+      fail-fast: false
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ plugins {
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group 'com.webank.wecross'
-version '1.3.2'
+version '1.4.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -87,10 +87,13 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.14'
 
     implementation 'org.apache.commons:commons-lang3:3.11'
-    implementation 'com.google.guava:guava:30.1-jre'
+    implementation 'com.google.guava:guava:32.0.1-jre'
     implementation 'org.yaml:snakeyaml:2.0'
 
-    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.1')
+    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.1') {
+        exclude group: "org.bouncycastle"
+    }
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
     implementation 'commons-io:commons-io:2.7'
 
     implementation 'org.fisco-bcos:solcJ:0.5.2.0'

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v1.3.0
+v1.4.0