提交 c54e117e 编写于 作者: 武汉红喜's avatar 武汉红喜

upgrade version

上级 0416876f
......@@ -29,8 +29,8 @@
</modules>
<properties>
<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
<spring.version>4.3.7.RELEASE</spring.version>
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
<spring.version>4.3.13.RELEASE</spring.version>
<mybatis.version>3.4.0</mybatis.version>
<servlet.version>3.1.0</servlet.version>
<mybatis-spring.version>1.2.2</mybatis-spring.version>
......@@ -40,13 +40,13 @@
<commons-collections.version>3.2.1</commons-collections.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<log4j.version>1.2.12</log4j.version>
<log4j.version>1.2.17</log4j.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>
<json-lib.version>2.4</json-lib.version>
<ezmorph.version>1.0.6</ezmorph.version>
<slf4j.version>1.7.1</slf4j.version>
<logback.version>1.0.6</logback.version>
<slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.3</logback.version>
<jackson.version>2.8.5</jackson.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<fastjson.version>1.2.31</fastjson.version>
......@@ -179,6 +179,7 @@
<scope>runtime</scope>
</dependency>
<!-- aspectj -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
......
......@@ -46,10 +46,6 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
......
......@@ -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">
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
<groupId>com.whatsmars</groupId>
<artifactId>whatsmars-parent</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>whatsmars-spring-boot-samples</artifactId>
<groupId>com.whatsmars</groupId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>Spring Boot Samples</description>
......@@ -20,10 +17,26 @@
<module>whatsmars-boot-sample-aop</module>
</modules>
<!--<properties>
<main.basedir>${basedir}/..</main.basedir>
<java.version>1.8</java.version>
</properties>-->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -25,14 +25,6 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -40,7 +40,7 @@
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.1.1</version>
<version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
......@@ -116,10 +116,6 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册