From 1d382ad7e9973fdae83f75723d24759926474ee1 Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Thu, 24 Nov 2016 14:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=94=B1=E7=88=B6=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97dependencyManagement=E7=AE=A1=E7=90=86=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms/cms-dao/pom.xml     |  2 --
 cms/cms-service/pom.xml | 15 ++++--------
 cms/cms-web/pom.xml     | 27 +++++++--------------
 cms/pom.xml             | 53 ++++++++++++++++++++++++++++++++++++-----
 pom.xml                 |  1 -
 5 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/cms/cms-dao/pom.xml b/cms/cms-dao/pom.xml
index b0cb0271..3a783550 100644
--- a/cms/cms-dao/pom.xml
+++ b/cms/cms-dao/pom.xml
@@ -22,8 +22,6 @@
         <dependency>
             <groupId>com.zheng</groupId>
             <artifactId>zheng-common</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
         </dependency>
     </dependencies>
 
diff --git a/cms/cms-service/pom.xml b/cms/cms-service/pom.xml
index df086c5e..ba8903f4 100644
--- a/cms/cms-service/pom.xml
+++ b/cms/cms-service/pom.xml
@@ -19,24 +19,17 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.zheng</groupId>
             <artifactId>zheng-cms-dao</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
         </dependency>
-        <!-- servlet -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/cms/cms-web/pom.xml b/cms/cms-web/pom.xml
index e0e0c0dd..32ba0827 100644
--- a/cms/cms-web/pom.xml
+++ b/cms/cms-web/pom.xml
@@ -15,36 +15,25 @@
     <url>http://www.zhangshuzheng.cn</url>
 
     <dependencies>
-        <!-- 测试 -->
+        <dependency>
+            <groupId>com.zheng</groupId>
+            <artifactId>zheng-cms-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
         </dependency>
-        <!-- servlet -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <!-- service -->
-        <dependency>
-            <groupId>com.zheng</groupId>
-            <artifactId>zheng-cms-service</artifactId>
-            <version>1.0.0</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-maven-plugin</artifactId>
-            <version>8.1.16.v20140903</version>
         </dependency>
     </dependencies>
 
diff --git a/cms/pom.xml b/cms/pom.xml
index 37627927..8eab01a0 100644
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -2,13 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.zheng</groupId>
-        <artifactId>zheng</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
+    <groupId>com.zheng</groupId>
     <artifactId>zheng-cms</artifactId>
+    <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <name>zheng-cms</name>
@@ -23,4 +19,49 @@
         <module>cms-service</module>
         <module>cms-web</module>
     </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.zheng</groupId>
+                <artifactId>zheng-common</artifactId>
+                <version>1.0.0</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.zheng</groupId>
+                <artifactId>zheng-cms-dao</artifactId>
+                <version>${project.version}</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>com.zheng</groupId>
+                <artifactId>zheng-cms-service</artifactId>
+                <version>${project.version}</version>
+                <type>jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>8.1.16.v20140903</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.12</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>jstl</artifactId>
+                <version>1.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2c0a3319..6e8108bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
 
     <modules>
         <module>common</module>
-        <module>cms</module>
         <module>oss</module>
         <module>qa</module>
         <module>upms</module>
-- 
GitLab