Skip to content

Commit

Permalink
Merge pull request #620 from ywy2090/release-2.5.0
Browse files Browse the repository at this point in the history
deps upgrades
  • Loading branch information
ywy2090 authored Jun 12, 2020
2 parents 966ecc9 + 99dcdf9 commit abd60aa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ verifyGoogleJavaFormat {
exclude '**/temp/*.java'
}

def spring_version = "4.3.25.RELEASE"
def spring_version = "4.3.27.RELEASE"

List logger = [
'org.slf4j:slf4j-log4j12:1.7.25'
//'org.slf4j:slf4j-api:1.7.25'
'org.slf4j:slf4j-log4j12:1.7.30'
//'org.slf4j:slf4j-api:1.7.30'
]

List spring = [
Expand Down Expand Up @@ -72,14 +72,14 @@ dependencies {
compile 'org.ethereum:solcJ-all:0.4.25'
compile spring, alibaba, logger
compile 'org.apache.commons:commons-lang3:3.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.10.0'
compile 'com.fasterxml.jackson.core:jackson-databind:2.11.0'

// compile 'io.netty:netty-tcnative:2.0.25.Final'
// compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
compile 'org.fisco-bcos:netty-sm-ssl-context:1.0.0-SNAPSHOT'
compile 'io.netty:netty-all:4.1.32.Final'
compile 'io.netty:netty-all:4.1.50.Final'

compile 'com.google.guava:guava:28.1-jre'
compile 'com.google.guava:guava:29.0-jre'
compile 'commons-configuration:commons-configuration:1.10'
compile 'org.apache.httpcomponents:httpclient:4.5.5'
compile 'org.bouncycastle:bcprov-jdk15on:1.60'
Expand Down
12 changes: 5 additions & 7 deletions publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,10 @@ verifyGoogleJavaFormat {
exclude '**/temp/*.java'
}

def spring_version = "4.3.25.RELEASE"
def spring_version = "4.3.27.RELEASE"

List logger = [
// 'org.slf4j:slf4j-log4j12:1.7.25'
'org.slf4j:slf4j-api:1.7.25'
'org.slf4j:slf4j-api:1.7.30'
]

List spring = [
Expand All @@ -68,21 +67,20 @@ dependencies {
compile 'org.ethereum:solcJ-all:0.4.25'
compile spring, alibaba, logger
compile 'org.apache.commons:commons-lang3:3.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.10.0'
compile 'com.fasterxml.jackson.core:jackson-databind:2.11.0'

// compile 'io.netty:netty-tcnative:2.0.25.Final'
// compile 'io.netty:netty-tcnative-boringssl-static:2.0.27.Final'
compile 'org.fisco-bcos:netty-sm-ssl-context:1.0.0-SNAPSHOT'
compile 'io.netty:netty-all:4.1.32.Final'
compile 'io.netty:netty-all:4.1.50.Final'

compile 'com.google.guava:guava:28.1-jre'
compile 'com.google.guava:guava:29.0-jre'
compile 'commons-configuration:commons-configuration:1.10'
compile 'org.apache.httpcomponents:httpclient:4.5.5'
compile 'org.bouncycastle:bcprov-jdk15on:1.60'
compile 'org.apache.commons:commons-collections4:4.0'
compile 'commons-io:commons-io:2.4'
compile 'org.projectlombok:lombok:1.18.2'
compile 'org.slf4j:slf4j-api:1.7.25'
compile 'com.lambdaworks:scrypt:1.4.0'
compile 'com.squareup:javapoet:1.7.0'
compile 'io.reactivex:rxjava:1.2.4'
Expand Down

0 comments on commit abd60aa

Please sign in to comment.