Skip to content

Commit

Permalink
- Adapt to latest weid-contract-java, VERSION and CHANGELOG.md
Browse files Browse the repository at this point in the history
- Remove travis.yml
  • Loading branch information
chaoxinhu committed Jun 16, 2020
1 parent 41bde3a commit 725db3b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 71 deletions.
62 changes: 0 additions & 62 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### V1.6.4 (2020-06-16)
- Bugfixes:
1. Update all dependencies to mitigate potential security risks.

### V1.6.3 (2020-06-01)
- Features:
1. Multi-group deployment support to separate Evidence and other smart contracts.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.3
1.6.4
20 changes: 12 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,14 @@ dependencies {
if (gradleVer.startsWith("4")) {
if (!gradle.startParameter.isOffline()) {
compile logger, lombok, apache_commons, json, mysql_driver, zxing, rpc, pdfbox, protobuf, caffeine, oval
compile("com.webank:weid-contract-java:1.2.20") {
exclude group: "org.fisco-bcos", module: "web3sdk"
compile("com.webank:weid-contract-java:1.2.21") {
exclude group: "org.slf4j", module: "slf4j-log4j12"
// exclude group: "org.fisco-bcos", module: "web3sdk"
// exclude group: "org.fisco-bcos", module: "web3sdk-weevent"
}
compile("org.fisco-bcos:web3sdk:2.4.1")
compile("org.fisco-bcos:web3sdk-weevent:1.2.6")
// Uncomment these two lines and exclude those above to specify web3sdk versions
// compile("org.fisco-bcos:web3sdk:2.4.1")
// compile("org.fisco-bcos:web3sdk-weevent:1.2.6")
compile fileTree(dir: 'lib', include: '*.jar')
testCompile logger, lombok, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval
} else {
Expand All @@ -161,12 +163,14 @@ dependencies {
testAnnotationProcessor 'org.projectlombok:lombok:1.18.10'
testCompileOnly 'org.projectlombok:lombok:1.18.10'
compile logger, apache_commons, json, mysql_driver, zxing, rpc, pdfbox, protobuf, caffeine, oval
compile("com.webank:weid-contract-java:1.2.20") {
exclude group: "org.fisco-bcos", module: "web3sdk"
compile("com.webank:weid-contract-java:1.2.21") {
exclude group: "org.slf4j", module: "slf4j-log4j12"
// exclude group: "org.fisco-bcos", module: "web3sdk"
// exclude group: "org.fisco-bcos", module: "web3sdk-weevent"
}
compile("org.fisco-bcos:web3sdk:2.4.1")
compile("org.fisco-bcos:web3sdk-weevent:1.2.6")
// Uncomment these two lines and exclude those above to specify web3sdk versions
// compile("org.fisco-bcos:web3sdk:2.4.1")
// compile("org.fisco-bcos:web3sdk-weevent:1.2.6")
compile fileTree(dir: 'lib', include: '*.jar')
testCompile logger, apache_commons, json, junit, jmockit, rpc, pdfbox, protobuf, caffeine, oval
} else {
Expand Down

0 comments on commit 725db3b

Please sign in to comment.