Skip to content

Commit

Permalink
Merge pull request #80 from CodingCattwo/dev132
Browse files Browse the repository at this point in the history
upgrade tomcat springboot
  • Loading branch information
CodingCattwo committed Jun 19, 2020
2 parents 6b7fa74 + 79bf6fb commit d4c84ca
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}


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 All @@ -32,8 +32,7 @@ def spring_version="4.3.27.RELEASE"
List spring =[
"org.springframework:spring-web:$spring_version",
"org.springframework:spring-webmvc:$spring_version",
"org.springframework:spring-jdbc:$spring_version",
"org.springframework:spring-messaging:$spring_version",
"org.springframework:spring-jdbc:$spring_version"
]

List mysql = [
Expand Down Expand Up @@ -83,8 +82,19 @@ 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_boot,spring,mysql,swagger,log4j,dangdang,zookeeper,jaxb,jackson
compile spring_boot,spring,mysql,swagger,log4j,dangdang,zookeeper,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 d4c84ca

Please sign in to comment.