diff --git a/pom.xml b/pom.xml index fdde1ace7c11c4daaeda1dbcdd1d16febd92f181..a72c901be3f83e235549071ea45424354918b8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,8 +29,8 @@ - 1.5.2.RELEASE - 4.3.7.RELEASE + 1.5.9.RELEASE + 4.3.13.RELEASE 3.4.0 3.1.0 1.2.2 @@ -40,13 +40,13 @@ 3.2.1 1.10 1.3.1 - 1.2.12 + 1.2.17 1.7 2.0 2.4 1.0.6 - 1.7.1 - 1.0.6 + 1.7.25 + 1.2.3 2.8.5 1.9.3 1.2.31 @@ -179,6 +179,7 @@ runtime + org.aspectj aspectjweaver diff --git a/whatsmars-sharding-jdbc/pom.xml b/whatsmars-sharding-jdbc/pom.xml index b05c7db20b9f0b9e86eaa76ef072302a12fdf754..39ad7140a28ea58193b5ea604e6b34c4f8adc75d 100644 --- a/whatsmars-sharding-jdbc/pom.xml +++ b/whatsmars-sharding-jdbc/pom.xml @@ -46,10 +46,6 @@ mybatis-spring-boot-starter 1.3.0 - - org.mybatis - mybatis-spring - commons-dbcp commons-dbcp diff --git a/whatsmars-spring-boot-samples/pom.xml b/whatsmars-spring-boot-samples/pom.xml index 510f69554fb433169d9c311a8ae44db1225fce43..d9400b800289b94b7b65e4eab53faa0a68aaebdb 100644 --- a/whatsmars-spring-boot-samples/pom.xml +++ b/whatsmars-spring-boot-samples/pom.xml @@ -3,16 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + com.whatsmars + whatsmars-parent + 1.0-SNAPSHOT 4.0.0 whatsmars-spring-boot-samples - com.whatsmars - 1.0-SNAPSHOT pom ${project.artifactId} Spring Boot Samples @@ -20,10 +17,26 @@ whatsmars-boot-sample-aop - + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + \ No newline at end of file diff --git a/whatsmars-spring-boot-samples/whatsmars-boot-sample-aop/pom.xml b/whatsmars-spring-boot-samples/whatsmars-boot-sample-aop/pom.xml index af12e2b571eb174277c9ebeb27895a549fd24f11..1ea884bb0e0751d2388698efb2251f56de047cda 100644 --- a/whatsmars-spring-boot-samples/whatsmars-boot-sample-aop/pom.xml +++ b/whatsmars-spring-boot-samples/whatsmars-boot-sample-aop/pom.xml @@ -25,14 +25,6 @@ test - - - - org.springframework.boot - spring-boot-maven-plugin - - - \ No newline at end of file diff --git a/whatsmars-spring-boot/pom.xml b/whatsmars-spring-boot/pom.xml index 645b8d6aeba95b176a160f6e93a2afbebc9f8245..cffce336b73f11ee989828ad7dbd2618b48fa15f 100644 --- a/whatsmars-spring-boot/pom.xml +++ b/whatsmars-spring-boot/pom.xml @@ -40,7 +40,7 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 1.1.1 + 1.3.0 org.springframework.boot @@ -116,10 +116,6 @@ spring-boot-starter-log4j2 - - org.mybatis - mybatis - commons-dbcp commons-dbcp diff --git a/whatsmars-spring-boot/src/main/resources/application.yml b/whatsmars-spring-boot/src/main/resources/application.yml index 7ea72fd51ea4870877ab54d37fdf9502dc684064..7a602ddc2e875fd07fe0b8af16d0e7a4dec66b85 100644 --- a/whatsmars-spring-boot/src/main/resources/application.yml +++ b/whatsmars-spring-boot/src/main/resources/application.yml @@ -35,7 +35,7 @@ user: spring: profiles: dev datasource: - url: jdbc:mysql://127.0.0.1:3306/wely?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true username: root password: root driver-class-name: com.mysql.jdbc.Driver