2.9.x fisco sdk sm_fix (#60)

* sm_fix --------- Co-authored-by: 王越 [email protected] <[email protected]>
WeBankBlockchain · Feb 21, 2023 · 16101f2 · 16101f2
1 parent 4ceb9a8
commit 16101f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/WeBankBlockchain-Data-Export-sdk/build.gradle b/WeBankBlockchain-Data-Export-sdk/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'signing'
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 
 group = 'com.webank'
-version = "1.7.8"
+version = "1.7.9"
 
 allprojects {
     repositories {
@@ -55,21 +55,24 @@ dependencies {
     compile logger
     compile ('cn.hutool:hutool-all:5.3.7')
     compile group: 'com.google.guava', name: 'guava', version: '30.0-jre'
-    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.0')
+    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.0'){
+        exclude(group: 'org.fisco-bcos', module: 'netty-sm-ssl-context')
+    }
+    implementation ('org.fisco-bcos:netty-sm-ssl-context:1.2.0')
     compile 'commons-codec:commons-codec:1.4'
-    compile group: "org.apache.shardingsphere", name: "shardingsphere-jdbc-core", version: '5.0.0-alpha'
+    compile (group: "org.apache.shardingsphere", name: "shardingsphere-jdbc-core", version: '5.0.0-alpha')
     compile('ch.qos.logback:logback-core:1.2.3')
     compile('ch.qos.logback:logback-classic:1.2.3')
     compileOnly ('org.projectlombok:lombok:1.18.10')
     annotationProcessor 'org.projectlombok:lombok:1.18.10'
     compile (group: 'com.zaxxer', name: 'HikariCP', version: '3.4.1')
     compile("com.fasterxml.jackson.core:jackson-databind:2.11.0")
-    compile 'org.elasticsearch.client:transport:7.10.2'
+    compile ('org.elasticsearch.client:transport:7.10.2')
     compile(group:'org.apache.shardingsphere.elasticjob', name: 'elasticjob-lite-core',version:'3.0.0-alpha')
-    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.16'
+    compile (group: 'mysql', name: 'mysql-connector-java', version: '8.0.16')
     compile 'org.apache.logging.log4j:log4j-core:2.11.0'
     testCompile ("junit:junit:4.12")
-    compile 'com.github.briandilley.jsonrpc4j:jsonrpc4j:1.0'
+    compile ('com.github.briandilley.jsonrpc4j:jsonrpc4j:1.0')
 }
 
 sourceSets {
@@ -211,7 +214,9 @@ subprojects {
     dependencies {
         compile ('cn.hutool:hutool-all:5.3.7')
         compile group: 'com.google.guava', name: 'guava', version: '30.0-jre'
-        implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.7.2')
+        implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.2'){
+            exclude(group: 'org.fisco-bcos', module: 'netty-sm-ssl-context')
+        }
         compile 'commons-codec:commons-codec:1.4'
         compile group: "org.apache.shardingsphere", name: "shardingsphere-jdbc-core", version: '5.0.0-alpha'
         compile('ch.qos.logback:logback-core:1.2.3')
@@ -220,7 +225,7 @@ subprojects {
         annotationProcessor 'org.projectlombok:lombok:1.18.10'
         compile (group: 'com.zaxxer', name: 'HikariCP', version: '3.4.1')
         compile("com.fasterxml.jackson.core:jackson-databind:2.11.0")
-        compile 'org.elasticsearch.client:transport:7.10.2'
+        compile ('org.elasticsearch.client:transport:7.10.2')
         compile(group:'org.apache.shardingsphere.elasticjob', name: 'elasticjob-lite-core',version:'3.0.0-alpha')
         compile 'org.apache.logging.log4j:log4j-core:2.11.0'
         testCompile ("junit:junit:4.12")

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ allprojects {
 }
 
 subprojects{
-    version = "1.7.8"
+    version = "1.7.9"
     group = 'com.webank'
 }
 
@@ -52,11 +52,9 @@ project(':WeBankBlockchain-Data-Export-service') {
     compile 'org.springframework.boot:spring-boot-starter-data-jpa'
     compileOnly 'org.projectlombok:lombok:1.18.10'
     annotationProcessor 'org.projectlombok:lombok:1.18.10'
-    testImplementation('org.springframework.boot:spring-boot-starter-test')
     testImplementation('org.springframework.boot:spring-boot-starter-test') {
       exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
-//    compile 'com.webank:data-export-sdk:1.7.2'
     implementation ('com.webank:solc-gradle-plugin:1.0.0'){
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
@@ -73,4 +71,3 @@ configurations {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
 }
-