fix spring3和4同时存在，使用import pom的统一管理 #909

apache · Nov 23, 2017 · 0d430a7 · 0d430a7
1 parent 4791067
commit 0d430a7
Showing 1 changed file with 11 additions and 39 deletions.
diff --git 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>