From c15d5b5370f4b44b4602b4045b66cc8ca87d3cfd Mon Sep 17 00:00:00 2001
From: lihengming <lihengming@duia.com>
Date: Thu, 27 Apr 2017 16:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=E4=BE=9D=E8=B5=96=EF=BC=8C=E7=94=B1=E4=BA=8ESpring=20?=
 =?UTF-8?q?Boot=E7=89=88=E6=9C=AC=E4=B8=BA1.5.2(=E9=9C=80spring1.3.4)?=
 =?UTF-8?q?=E8=80=8Cspring.version=E7=89=88=E6=9C=AC=E4=B8=BA3.2.5?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=B5=8B=E8=AF=95=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=EF=BC=8C=E6=89=80=E4=BB=A5?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E4=BA=86Spring=20Dependency=20Manager=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7spring.version=E4=B8=BA3.3.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0ff8be62d..9b3aab7682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>