Revert "Revert "udpate pom.xml""

This reverts commit 3853ad1f1b92e90178b41f0079ddf731a743143c.

cms/cms-dao/pom.xml

@@ -1,11 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
         <artifactId>zheng-cms</artifactId>
         <groupId>com.zheng</groupId>
         <version>1.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>zheng-cms-dao</artifactId>
     <packaging>jar</packaging>

cms/cms-service/pom.xml

@@ -1,11 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
         <artifactId>zheng-cms</artifactId>
         <groupId>com.zheng</groupId>
         <version>1.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>zheng-cms-service</artifactId>
     <packaging>jar</packaging>

cms/cms-web/pom.xml

@@ -1,11 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>zheng-cms</artifactId>
         <groupId>com.zheng</groupId>
         <version>1.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>zheng-cms-web</artifactId>
     <packaging>war</packaging>
 

cms/pom.xml

@@ -2,9 +2,13 @@
          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>
 
-    <groupId>com.zheng</groupId>
+    <parent>
+        <artifactId>zheng</artifactId>
+        <groupId>com.zheng</groupId>
+        <version>1.0.0</version>
+    </parent>
+
     <artifactId>zheng-cms</artifactId>
-    <version>1.0.0</version>
     <packaging>pom</packaging>
 
     <name>zheng-cms</name>

common/pom.xml

@@ -2,9 +2,13 @@
          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>
 
-    <groupId>com.zheng</groupId>
+    <parent>
+        <artifactId>zheng</artifactId>
+        <groupId>com.zheng</groupId>
+        <version>1.0.0</version>
+    </parent>
+
     <artifactId>zheng-common</artifactId>
-    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>zheng-common</name>

oss/oss-sdk/pom.xml

@@ -1,11 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
         <artifactId>zheng-oss</artifactId>
         <groupId>com.zheng</groupId>
         <version>1.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>zheng-oss-sdk</artifactId>
     <packaging>jar</packaging>

oss/oss-web/pom.xml

@@ -1,11 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>zheng-oss</artifactId>
         <groupId>com.zheng</groupId>
         <version>1.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>zheng-oss-web</artifactId>
     <packaging>war</packaging>
 

oss/pom.xml

@@ -2,13 +2,13 @@
          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>
 
-    <groupId>com.zheng</groupId>
+    <parent>
+        <artifactId>zheng</artifactId>
+        <groupId>com.zheng</groupId>
+        <version>1.0.0</version>
+    </parent>
+
     <artifactId>zheng-oss</artifactId>
-    <version>1.0.0</version>
-    <modules>
-        <module>oss-sdk</module>
-        <module>oss-web</module>
-    </modules>
     <packaging>pom</packaging>
 
     <name>zheng-oss</name>
@@ -18,12 +18,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>oss-sdk</module>
+        <module>oss-web</module>
+    </modules>
 </project>

pom.xml

@@ -19,8 +19,9 @@
     </properties>
 
     <modules>
-        <module>cms</module>
         <module>common</module>
+        <module>cms</module>
         <module>oss</module>
+        <module>qa</module>
     </modules>
 </project>