Skip to content

Commit

Permalink
Merge pull request #417 from CodingCattwo/dev132
Browse files Browse the repository at this point in the history
upgrade tomcat springboot
  • Loading branch information
CodingCattwo authored Jun 19, 2020
2 parents 8755b59 + 826aa90 commit 8402656
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ List spring =[

]

def spring_boot_version="1.5.9.RELEASE"
def spring_boot_version="1.5.22.RELEASE"
List spring_boot =[
"org.springframework.boot:spring-boot-starter-web:$spring_boot_version",
"org.springframework.boot:spring-boot-autoconfigure:$spring_boot_version",
Expand Down Expand Up @@ -79,8 +79,18 @@ List jackson = [
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
]

// cover old version
def tomcat_version = "8.5.56"
List tomcat = [
"org.apache.tomcat.embed:tomcat-embed-core:$tomcat_version",
"org.apache.tomcat.embed:tomcat-embed-el:$tomcat_version",
"org.apache.tomcat.embed:tomcat-embed-websocket:$tomcat_version",
"org.apache.tomcat:tomcat-jdbc:$tomcat_version",
"org.apache.tomcat:tomcat-juli:$tomcat_version"
]

dependencies {
compile spring,spring_boot,swagger,logger,jaxb,jackson
compile spring,spring_boot,swagger,logger,jaxb,jackson,tomcat
compile ('org.fisco-bcos:web3sdk:2.4.1')
// support guomi/ecdsa same time, support solcJ-0.5.2
compile ('org.fisco-bcos:solcJ:0.4.25-rc1')
Expand Down

0 comments on commit 8402656

Please sign in to comment.