增加测试示例依赖,由于Spring Boot版本为1.5.2(需spring1.3.4)而spring.version版本为3.2.5,导致测试示例无法启动,所以引入了Spring Dependency Manager 升级spring.version为3.3.4

This commit is contained in:
lihengming
2017-04-27 16:19:44 +08:00
parent 6d5a1278a3
commit c15d5b5370
+23 -7
View File
@@ -19,7 +19,6 @@
<inceptionYear>2013</inceptionYear>
<properties>
<spring.version>4.2.5.RELEASE</spring.version>
<junit.version>4.12</junit.version>
<gpg.skip>false</gpg.skip>
@@ -353,6 +352,19 @@
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>1.5.2.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>simple-jndi</groupId>
@@ -386,35 +398,30 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>1.5.2.RELEASE</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -553,7 +560,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -673,5 +679,15 @@
<version>19.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>