diff --git a/build.gradle b/build.gradle index ebbd227..162dea1 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ apply plugin: 'java' apply plugin: 'jacoco' apply plugin: 'com.github.johnrengelman.shadow' group 'com.webank.wecross' -version '1.3.0' +version '1.4.0' sourceCompatibility = 1.8 @@ -60,14 +60,18 @@ dependencies { } implementation 'com.google.code.gson:gson:2.8.9' implementation 'org.slf4j:slf4j-api:1.7.36' - implementation 'com.google.guava:guava:30.1-jre' + implementation 'com.google.guava:guava:32.0.1-jre' implementation 'org.yaml:snakeyaml:2.0' // Fabric implementation 'javassist:javassist:3.12.1.GA' - implementation ("org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4") { + implementation ("org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.16") { exclude group: 'io.netty' + exclude group: 'com.google.protobuf', module: 'protobuf-java' } + implementation "com.google.protobuf:protobuf-java:3.25.3" + implementation 'org.apache.commons:commons-compress:1.26.0' +// implementation 'commons-io:commons-io:2.7' // implementation 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final' // WeCross diff --git a/release_note.txt b/release_note.txt index 18fa8e7..0d0c52f 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.3.0 +v1.4.0 diff --git a/src/main/java/com/webank/wecross/utils/TarUtils.java b/src/main/java/com/webank/wecross/utils/TarUtils.java index ab23eb9..9ec37fe 100644 --- a/src/main/java/com/webank/wecross/utils/TarUtils.java +++ b/src/main/java/com/webank/wecross/utils/TarUtils.java @@ -61,7 +61,7 @@ private static byte[] generateTarGzInputStreamBytes(File src, String pathPrefix) archiveEntry = new TarArchiveEntry(childFile, relativePath); try (FileInputStream fileInputStream = new FileInputStream(childFile)) { - archiveOutputStream.putArchiveEntry(archiveEntry); + archiveOutputStream.putArchiveEntry((TarArchiveEntry) archiveEntry); try { IOUtils.copy(fileInputStream, archiveOutputStream);