<build>(project): update org.bouncycastle to bcprov-jdk18on commonsIO…

…Version to 2.7. (#815)
FISCO-BCOS · Oct 24, 2023 · 59b13fe · 59b13fe
1 parent d7491f7
commit 59b13fe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/.ci/ci_check.sh b/.ci/ci_check.sh
@@ -30,8 +30,8 @@ download_tassl()
 download_build_chain()
 {
   LOG_INFO "--- current tag: $tag"
-#  curl -LO "https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/${tag}/build_chain.sh" && chmod u+x build_chain.sh
-  curl -LO "https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master-2.0/tools/build_chain.sh" && chmod u+x build_chain.sh
+  curl -LO "https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/${tag}/build_chain.sh" && chmod u+x build_chain.sh
+#  curl -LO "https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master-2.0/tools/build_chain.sh" && chmod u+x build_chain.sh
 }
 
 get_sed_cmd()

diff --git a/build.gradle b/build.gradle
@@ -16,16 +16,16 @@ ext {
     }
     // jackson version
     jacksonVersion = "2.15.2"
-    commonsIOVersion = "2.4"
+    commonsIOVersion = '2.7'
     commonsLang3Version = "3.1"
     javapoetVersion = "1.7.0"
     picocliVersion = "3.6.0"
     nettySMSSLContextVersion = "1.5.2"
     toml4jVersion = "0.7.2"
-    bcprovJDK15onVersion = "1.60"
+    bcprovJDK18onVersion = "1.76"
     webankJavaCryptoVersion = "1.0.2"
     webankHsmCryptoVersion = "1.0.0-GMT0018"
-
+    gsonVersion = '2.10.1'
     slf4jVersion = "1.7.36"
     junitVersion = '4.13.1'
     commonsCollections4Version = "4.4"
@@ -35,7 +35,7 @@ ext {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '2.9.3'
+    version = '2.10.0-SNAPSHOT'
     apply plugin: 'maven'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'
@@ -188,15 +188,20 @@ task integrationTest(type: Test) {
 }
 
 dependencies {
-	compile ("org.bouncycastle:bcprov-jdk15on:${bcprovJDK15onVersion}")
+	compile ("org.bouncycastle:bcprov-jdk18on:${bcprovJDK18onVersion}")
     compile ("org.apache.commons:commons-lang3:${commonsLang3Version}")
-    compile ("org.fisco-bcos:netty-sm-ssl-context:${nettySMSSLContextVersion}")
+    compile ("org.fisco-bcos:netty-sm-ssl-context:${nettySMSSLContextVersion}"){
+        exclude group: "org.bouncycastle"
+    }
     compile ("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
     compile ("commons-io:commons-io:${commonsIOVersion}")
     compile ("com.squareup:javapoet:${javapoetVersion}")
     compile ("info.picocli:picocli:${picocliVersion}")
     compile ("com.webank:webank-blockchain-java-crypto:${webankJavaCryptoVersion}")
-    compile ("com.moandjiezana.toml:toml4j:${toml4jVersion}")
+    compile ("com.google.code.gson:gson:${gsonVersion}")
+    compile ("com.moandjiezana.toml:toml4j:${toml4jVersion}"){
+        exclude group: "com.google.code.gson"
+    }
     compile ("com.webank:webank-blockchain-hsm-crypto:${webankHsmCryptoVersion}")
     testCompile ("org.apache.commons:commons-collections4:${commonsCollections4Version}")
 }

diff --git a/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java b/sdk-abi/src/main/java/org/fisco/bcos/sdk/abi/wrapper/ABIDefinitionFactory.java
@@ -60,15 +60,17 @@ public ContractABIDefinition loadABI(String abi) {
                         break;
                 }
 
-                if (logger.isInfoEnabled()) {
-                    logger.info(" abiDefinition: {}", abiDefinition);
+                if (logger.isTraceEnabled()) {
+                    logger.trace(" abiDefinition: {}", abiDefinition);
                 }
             }
             if (contractABIDefinition.getConstructor() == null) {
                 contractABIDefinition.setConstructor(
                         ABIDefinition.createDefaultConstructorABIDefinition());
             }
-            logger.info(" contractABIDefinition {} ", contractABIDefinition);
+            if (logger.isTraceEnabled()) {
+                logger.trace(" contractABIDefinition {} ", contractABIDefinition);
+            }
 
             return contractABIDefinition;
 

diff --git a/sdk-crypto/build.gradle b/sdk-crypto/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 dependencies {
     compile project(':sdk-core')
-    compile ("org.bouncycastle:bcprov-jdk15on:${bcprovJDK15onVersion}")
+    compile ("org.bouncycastle:bcprov-jdk18on:${bcprovJDK18onVersion}")
     compile ("com.webank:webank-blockchain-java-crypto:${webankJavaCryptoVersion}")
     compile ("com.webank:webank-blockchain-hsm-crypto:${webankHsmCryptoVersion}")
 }