diff --git a/litemall-core/pom.xml b/litemall-core/pom.xml index ec905df8..cb4ab9b0 100644 --- a/litemall-core/pom.xml +++ b/litemall-core/pom.xml @@ -23,8 +23,8 @@ - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 + org.springframework.boot + spring-boot-starter-json diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml index efe31994..583a0c64 100644 --- a/litemall-db/src/main/resources/application-db.yml +++ b/litemall-db/src/main/resources/application-db.yml @@ -22,5 +22,5 @@ spring: test-on-return: false test-while-idle: true time-between-eviction-runs-millis: 60000 - filters: stat,wall,log4j + filters: stat,wall diff --git a/pom.xml b/pom.xml index dbd7d6fb..cfcef2a4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.12.RELEASE + 2.0.4.RELEASE @@ -55,12 +55,6 @@ ${project.version} - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.9.5 - - org.mybatis.spring.boot @@ -85,7 +79,7 @@ com.alibaba druid-spring-boot-starter - 1.1.9 + 1.1.10 @@ -118,10 +112,16 @@ 2.5.0 + + org.springframework.boot + spring-boot-starter-json + 2.0.4.RELEASE + + org.springframework.boot spring-boot-starter-mail - 1.5.12.RELEASE + 2.0.4.RELEASE