From 0d430a75f24b0a0683e78b45c6927389f7432912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=A9?= <takeseem@gmail.com>
Date: Thu, 23 Nov 2017 11:34:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20spring3=E5=92=8C4=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BD=BF=E7=94=A8import=20pom?=
 =?UTF-8?q?=E7=9A=84=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=20#909?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dubbo-admin/pom.xml | 50 ++++++++++-----------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml
index 0222ff7974b..d1df25468e5 100644
--- a/dubbo-admin/pom.xml
+++ b/dubbo-admin/pom.xml
@@ -31,52 +31,24 @@
         <eclipse.useProjectReferences>false</eclipse.useProjectReferences>
         <skip_maven_deploy>false</skip_maven_deploy>
     </properties>
+    <dependencyManagement>
+   	   	<dependencies>
+   	   	   	<dependency>
+   	   	   	   	<groupId>org.springframework</groupId>
+   	   	   	   	<artifactId>spring-framework-bom</artifactId>
+   	   	   	   	<version>3.2.18.RELEASE</version>
+   	   	   	   	<scope>import</scope>
+   	   	   	   	<type>pom</type>
+   	   	   	</dependency>
+   	   	</dependencies>
+   	</dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
             <version>${project.parent.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!-- FIXME 临时解决spring 4和webx3.x不兼容的问题 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>3.2.16.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.citrus</groupId>
             <artifactId>citrus-webx-all</artifactId>