Merge pull request #379 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit '66ee1e7028eab11c2c6dd34f9f31ef85ab29549c':
  提交错了一个类，删掉
  无JIRA任务 修改pom版本号规则

designer-base/pom.xml

@@ -6,8 +6,11 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
+    <groupId>com.fr.report</groupId>
+    <artifactId>designer-base</artifactId>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>io.socket</groupId>
@@ -15,7 +18,5 @@
             <version>0.7.0</version>
         </dependency>
     </dependencies>
-    <groupId>com.fr.report</groupId>
-    <artifactId>designer-base</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+
 </project>

designer-chart/pom.xml

@@ -6,16 +6,16 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-chart</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-base</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

designer-form/pom.xml

@@ -6,16 +6,16 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-form</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
      <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-base</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

designer-realize/pom.xml

@@ -6,21 +6,21 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>design</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
     </parent>
     <groupId>com.fr.report</groupId>
     <artifactId>designer-realize</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>${branch}-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-form</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-chart</artifactId>
-            <version>10.0-RELEASE-SNAPSHOT</version>
+            <version>${branch}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.fr.report</groupId>
         <artifactId>fine-report-designer</artifactId>
-        <version>10.0-RELEASE-SNAPSHOT</version>
+        <version>10.0</version>
         <relativePath>../design-settings/fine-report-designer</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
     </modules>
     <groupId>com.fr.report</groupId>
     <artifactId>design</artifactId>
-    <version>10.0-RELEASE-SNAPSHOT</version>
+    <version>10.0</version>
     <packaging>pom</packaging>
     <build>
         <plugins>