From 837a2925a38a6784908f62ada033e7945fc0cf00 Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Thu, 18 Oct 2018 00:07:24 +0800
Subject: [PATCH] consist for pom

---
 pom.xml                                                     | 6 ++++--
 sharding-core/pom.xml                                       | 1 -
 sharding-jdbc/pom.xml                                       | 4 ++--
 sharding-jdbc/sharding-jdbc-core/pom.xml                    | 6 ++++--
 .../sharding-jdbc-orchestration-spring-boot-starter/pom.xml | 5 ++++-
 .../sharding-jdbc-orchestration-spring-namespace/pom.xml    | 5 ++++-
 sharding-jdbc/sharding-jdbc-orchestration/pom.xml           | 2 +-
 .../sharding-jdbc-spring-boot-starter/pom.xml               | 6 +++++-
 .../sharding-jdbc-spring-namespace/pom.xml                  | 6 +++++-
 sharding-opentracing/pom.xml                                | 1 -
 sharding-orchestration/pom.xml                              | 3 +--
 sharding-orchestration/sharding-orchestration-core/pom.xml  | 4 ++--
 sharding-orchestration/sharding-orchestration-reg/pom.xml   | 4 ++--
 .../sharding-orchestration-reg-api/pom.xml                  | 2 +-
 .../sharding-orchestration-reg-etcd/pom.xml                 | 2 +-
 .../sharding-orchestration-reg-native-zookeeper/pom.xml     | 2 +-
 .../sharding-orchestration-reg-zookeeper-curator/pom.xml    | 2 +-
 sharding-proxy/pom.xml                                      | 1 -
 sharding-sql-test/pom.xml                                   | 3 +--
 sharding-transaction/pom.xml                                | 1 -
 20 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 90ff6cf7bc93a..ada9b7fc5a97a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
     <groupId>io.shardingsphere</groupId>
     <artifactId>sharding-sphere</artifactId>
     <version>3.0.0.M5-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
     
     <modules>
         <module>sharding-core</module>
diff --git a/sharding-core/pom.xml b/sharding-core/pom.xml
index b4a964f6f0a9e..23abf663cec1f 100644
--- a/sharding-core/pom.xml
+++ b/sharding-core/pom.xml
@@ -9,7 +9,6 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-core</artifactId>
-    <name>${project.artifactId}</name>
     
     <dependencies>
         <dependency>
diff --git a/sharding-jdbc/pom.xml b/sharding-jdbc/pom.xml
index c610e04027e97..5915565145014 100644
--- a/sharding-jdbc/pom.xml
+++ b/sharding-jdbc/pom.xml
@@ -2,12 +2,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>sharding-sphere</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-sphere</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>sharding-jdbc</artifactId>
     <packaging>pom</packaging>
     
diff --git a/sharding-jdbc/sharding-jdbc-core/pom.xml b/sharding-jdbc/sharding-jdbc-core/pom.xml
index 2bec1a4d161d6..e817b5f2386c3 100644
--- a/sharding-jdbc/sharding-jdbc-core/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-core/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
@@ -7,7 +9,7 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-jdbc-core</artifactId>
-    <name>${project.artifactId}</name>
+    
     <dependencies>
         <dependency>
             <groupId>io.shardingsphere</groupId>
diff --git a/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml b/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml
index 2c7ff22538c22..ecd592f709048 100644
--- a/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/pom.xml
@@ -1,4 +1,7 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
         <groupId>io.shardingsphere</groupId>
diff --git a/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/pom.xml b/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/pom.xml
index 2c9a346cd48c8..b8d824bea6700 100644
--- a/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/pom.xml
@@ -1,4 +1,7 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
         <groupId>io.shardingsphere</groupId>
diff --git a/sharding-jdbc/sharding-jdbc-orchestration/pom.xml b/sharding-jdbc/sharding-jdbc-orchestration/pom.xml
index 42e763c18b075..7cc67cd71dd56 100644
--- a/sharding-jdbc/sharding-jdbc-orchestration/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-orchestration/pom.xml
@@ -2,12 +2,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>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-jdbc</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>sharding-jdbc-orchestration</artifactId>
     
     <dependencies>
diff --git a/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/pom.xml b/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/pom.xml
index ce81ba8a1e8cc..9d546d265045f 100644
--- a/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/pom.xml
@@ -1,4 +1,7 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
         <groupId>io.shardingsphere</groupId>
@@ -6,6 +9,7 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+    
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-namespace/pom.xml b/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-namespace/pom.xml
index c9ebe57cc3d01..c55e5054642a9 100644
--- a/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-namespace/pom.xml
+++ b/sharding-jdbc/sharding-jdbc-spring/sharding-jdbc-spring-namespace/pom.xml
@@ -1,4 +1,7 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
         <groupId>io.shardingsphere</groupId>
@@ -6,6 +9,7 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-jdbc-spring-namespace</artifactId>
+    
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/sharding-opentracing/pom.xml b/sharding-opentracing/pom.xml
index 2a0fdb458d4d6..49200a6d2b801 100644
--- a/sharding-opentracing/pom.xml
+++ b/sharding-opentracing/pom.xml
@@ -9,7 +9,6 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-opentracing</artifactId>
-    <name>${project.artifactId}</name>
     
     <dependencies>
         <dependency>
diff --git a/sharding-orchestration/pom.xml b/sharding-orchestration/pom.xml
index f99603aaab727..14d21b743b68c 100644
--- a/sharding-orchestration/pom.xml
+++ b/sharding-orchestration/pom.xml
@@ -2,15 +2,14 @@
 <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>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>sharding-orchestration</artifactId>
     <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
     
     <modules>
         <module>sharding-orchestration-core</module>
diff --git a/sharding-orchestration/sharding-orchestration-core/pom.xml b/sharding-orchestration/sharding-orchestration-core/pom.xml
index e5edc415a25d4..8684a074f7183 100644
--- a/sharding-orchestration/sharding-orchestration-core/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-core/pom.xml
@@ -2,12 +2,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>sharding-orchestration</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>sharding-orchestration-core</artifactId>
     
     <dependencies>
diff --git a/sharding-orchestration/sharding-orchestration-reg/pom.xml b/sharding-orchestration/sharding-orchestration-reg/pom.xml
index fbc107a0983bb..1a2c4e20ebabd 100644
--- a/sharding-orchestration/sharding-orchestration-reg/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/pom.xml
@@ -2,12 +2,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>sharding-orchestration</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>sharding-orchestration-reg</artifactId>
     <packaging>pom</packaging>
     
diff --git a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-api/pom.xml b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-api/pom.xml
index ae4de19bf03cf..1a881e1241703 100644
--- a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-api/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-api/pom.xml
@@ -4,8 +4,8 @@
          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>sharding-orchestration-reg</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration-reg</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-orchestration-reg-api</artifactId>
diff --git a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-etcd/pom.xml b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-etcd/pom.xml
index b0d4c691d0fe5..9380128ffa970 100644
--- a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-etcd/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-etcd/pom.xml
@@ -4,8 +4,8 @@
          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>sharding-orchestration-reg</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration-reg</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-orchestration-reg-etcd</artifactId>
diff --git a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-native-zookeeper/pom.xml b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-native-zookeeper/pom.xml
index 933956bca0991..8d4de8deca0b1 100644
--- a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-native-zookeeper/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-native-zookeeper/pom.xml
@@ -4,8 +4,8 @@
          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>sharding-orchestration-reg</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration-reg</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-orchestration-reg-native-zookeeper</artifactId>
diff --git a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml
index e200cd8ee2468..c1b0d55d6c893 100644
--- a/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml
@@ -4,8 +4,8 @@
          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>sharding-orchestration-reg</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-orchestration-reg</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>
diff --git a/sharding-proxy/pom.xml b/sharding-proxy/pom.xml
index b10e89d04e55d..27339aa94c715 100644
--- a/sharding-proxy/pom.xml
+++ b/sharding-proxy/pom.xml
@@ -9,7 +9,6 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-proxy</artifactId>
-    <name>${project.artifactId}</name>
     
     <dependencies>
         <dependency>
diff --git a/sharding-sql-test/pom.xml b/sharding-sql-test/pom.xml
index b6bbfd57b05eb..817be9a49f764 100644
--- a/sharding-sql-test/pom.xml
+++ b/sharding-sql-test/pom.xml
@@ -4,10 +4,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>
-        <artifactId>sharding-sphere</artifactId>
         <groupId>io.shardingsphere</groupId>
+        <artifactId>sharding-sphere</artifactId>
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-sql-test</artifactId>
-    <name>${project.artifactId}</name>
 </project>
diff --git a/sharding-transaction/pom.xml b/sharding-transaction/pom.xml
index bfc47ce71dd07..3d276cfe82782 100644
--- a/sharding-transaction/pom.xml
+++ b/sharding-transaction/pom.xml
@@ -9,7 +9,6 @@
         <version>3.0.0.M5-SNAPSHOT</version>
     </parent>
     <artifactId>sharding-transaction</artifactId>
-    <name>${project.artifactId}</name>
     
     <dependencies>
         <dependency>