Merge pull request #337 from WeBankBlockchain/feature/support-javasdk

Feature/support javasdk

.gitignore

@@ -197,4 +197,4 @@ doc/bak/
 /dist/
 
 secring.gpg
-gradle.properties
+*.address

CHANGELOG.md

@@ -1,4 +1,11 @@
-### V1.7.0
+### V1.8.5 (2022-08-16)
+Features:
+1. Replace the web3sdk with fisco-bcos-java-sdk
+2. Support the OSCCA-approved(SM2/SM3) cryptography algorithm
+3. Support the FISCO BCOS 3.0.0 (rc4 version)
+4. Upgrade the functionality of WeID-Build-Tools to accommodate the new version of weid-java-sdk 
+
+### V1.7.0 (2021-01-08)
 Features: 
 1. FISCO BCOS 1.3.x support is fully removed - please use the FISCO BCOS 2.x node version respectively.
 2. Evidence and WeIdDocument query performance improved due to support batch type blockchain node data lookup.

VERSION

@@ -1 +1 @@
-1.8.5-rc.8-SNAPSHOT
+1.8.5-rc1

build.gradle

@@ -68,7 +68,7 @@ repositories {
         }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
         maven { url "https://oss.sonatype.org/content/groups/public/" }
-        maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
     } else {
         maven {
             url 'dependencies'
@@ -173,7 +173,8 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval, gson
-        compile("com.webank:weid-contract-java:1.3.0-rc.4-SNAPSHOT")
+        // compile("com.webank:weid-contract-java:1.3.0-rc.4-SNAPSHOT")
+        compile("com.webank:weid-contract-java:1.3.0-rc1")
 
         compile fileTree(dir: 'lib', include: '*.jar')
         implementation 'com.google.guava:guava:31.1-jre'
@@ -344,7 +345,7 @@ if (!gradle.startParameter.isOffline()) {
        uploadArchives {
         repositories {
             mavenDeployer {
-                // beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
                 repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
                     authentication(userName: sonatypeUsername, password: sonatypePassword)

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 jdkTlsNamedGroups=secp256r1,secp256k1
-repoType=cn
+repoType=en
 signing.keyId=
 signing.password=
 signing.secretKeyRingFile=