Skip to content

Commit d0c7d11

Browse files
authored
Merge pull request #624 from ywy2090/release-2.1.4
deps upgrades
2 parents f11e446 + 10c257d commit d0c7d11

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

build.gradle

+16-16
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ verifyGoogleJavaFormat {
4545
exclude '**/temp/*.java'
4646
}
4747

48-
def spring_version="4.3.25.RELEASE"
48+
def spring_version = "4.3.27.RELEASE"
4949

5050
List logger = [
51-
'org.slf4j:slf4j-log4j12:1.7.25'
52-
//'org.slf4j:slf4j-api:1.7.25'
51+
'org.slf4j:slf4j-log4j12:1.7.30'
52+
//'org.slf4j:slf4j-api:1.7.30'
5353
]
5454

5555
List spring =[
@@ -65,19 +65,19 @@ List alibaba = [
6565

6666
// In this section you declare the dependencies for your production and test code
6767
dependencies {
68-
// compile files('lib/solcJ-all-0.4.25-gm.jar')
69-
// compile 'org.ethereum:solcJ-all:0.5.2'
70-
compile 'org.ethereum:solcJ-all:0.4.25'
71-
compile logger,spring,alibaba
72-
compile 'org.apache.commons:commons-lang3:3.1'
73-
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
74-
compile 'io.netty:netty-all:4.1.32.Final'
75-
compile 'io.netty:netty-tcnative:2.0.25.Final'
76-
compile 'io.netty:netty-tcnative-boringssl-static:2.0.20.Final'
77-
compile 'com.google.guava:guava:28.1-jre'
78-
compile 'commons-configuration:commons-configuration:1.10'
79-
// web3j
80-
compile 'org.apache.httpcomponents:httpclient:4.5.5',
68+
// compile files('lib/solcJ-all-0.4.25-gm.jar')
69+
// compile 'org.ethereum:solcJ-all:0.5.2'
70+
compile 'org.ethereum:solcJ-all:0.4.25'
71+
compile logger, spring, alibaba
72+
compile 'org.apache.commons:commons-lang3:3.1'
73+
compile 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
74+
compile 'io.netty:netty-all:4.1.50.Final'
75+
compile 'io.netty:netty-tcnative:2.0.25.Final'
76+
compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
77+
compile 'com.google.guava:guava:29.0-jre'
78+
compile 'commons-configuration:commons-configuration:1.10'
79+
// web3j
80+
compile 'org.apache.httpcomponents:httpclient:4.5.5',
8181
'org.bouncycastle:bcprov-jdk15on:1.60',
8282
'com.lambdaworks:scrypt:1.4.0',
8383
'com.squareup:javapoet:1.7.0',

publish.gradle

+8-7
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ verifyGoogleJavaFormat {
4343
exclude '**/temp/*.java'
4444
}
4545

46-
def spring_version="4.3.25.RELEASE"
46+
def spring_version = "4.3.27.RELEASE"
4747

4848
List logger = [
49-
// 'org.slf4j:slf4j-log4j12:1.7.25'
50-
'org.slf4j:slf4j-api:1.7.25'
49+
// 'org.slf4j:slf4j-log4j12:1.7.30'
50+
'org.slf4j:slf4j-api:1.7.30'
5151
]
5252

5353
List spring =[
@@ -68,11 +68,12 @@ dependencies {
6868
compile 'org.ethereum:solcJ-all:0.4.25'
6969
compile logger,spring,alibaba
7070
compile 'org.apache.commons:commons-lang3:3.1'
71-
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
72-
compile 'io.netty:netty-all:4.1.32.Final'
71+
72+
compile 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
73+
compile 'io.netty:netty-all:4.1.50.Final'
7374
compile 'io.netty:netty-tcnative:2.0.25.Final'
74-
compile 'io.netty:netty-tcnative-boringssl-static:2.0.20.Final'
75-
compile 'com.google.guava:guava:28.1-jre'
75+
compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
76+
compile 'com.google.guava:guava:29.0-jre'
7677
compile 'commons-configuration:commons-configuration:1.10'
7778
// web3j
7879
compile 'org.apache.httpcomponents:httpclient:4.5.5',

src/main/java/org/fisco/bcos/web3j/tx/txdecode/ContractAbiUtil.java

-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
package org.fisco.bcos.web3j.tx.txdecode;
1616

17-
import com.fasterxml.jackson.core.JsonProcessingException;
1817
import com.fasterxml.jackson.databind.ObjectMapper;
19-
import java.io.IOException;
2018
import java.util.ArrayList;
2119
import java.util.List;
2220
import org.fisco.bcos.web3j.abi.EventValues;

0 commit comments

Comments
 (0)