Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

<fix>(build): update spring, guava and fabric sdk deps. #152

Merged
merged 1 commit into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: actions check
on: pull_request

jobs:
ubuntu1804jdk8:
ubuntujdk8:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand All @@ -19,7 +19,7 @@ jobs:
- name: upload coverage
run: bash <(curl -s https://codecov.io/bash)

ubuntu1804jdk11:
ubuntujdk11:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
Expand Down
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -60,14 +60,17 @@ 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") {
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 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'

// WeCross
Expand Down
2 changes: 1 addition & 1 deletion release_note.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.3.0
v1.4.0
2 changes: 1 addition & 1 deletion src/main/java/com/webank/wecross/utils/TarUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading