upgrade to 3.1.0

apache · Jan 3, 2019 · 4f4ca19 · 4f4ca19
1 parent 5d7bcff
commit 4f4ca19
Show file tree

Hide file tree

Showing 24 changed files with 34 additions and 29 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,6 +1,6 @@
-## 3.1.0.M1
+## 3.1.0
 
-### API changes
+### API Changes
 
 1. Adjust persist structure for orchestration's registry center.
 1. Adjust Sharding-JDBC configuration API.
@@ -13,7 +13,9 @@
 1. Broadcast table available.
 1. Solve data lean problem when using DefaultKeyGenerator with low TPS.
 
-[Change Logs for Issues and Pull requests](https://github.com/sharding-sphere/sharding-sphere/milestone/3)
+###  Change Logs
+1. [MILESTONE #3](https://github.com/sharding-sphere/sharding-sphere/milestone/3)
+1. [MILESTONE #4](https://github.com/sharding-sphere/sharding-sphere/milestone/4)
 
 ## 3.0.0
 

diff --git a/RELEASE-NOTES_ZH.md b/RELEASE-NOTES_ZH.md
@@ -1,4 +1,4 @@
-## 3.1.0.M1
+## 3.1.0
 
 ### API调整
 
@@ -13,7 +13,10 @@
 1. 支持广播表。
 1. 解决使用默认分布式自增主键在TPS不高的情况下可能导致数据倾斜的问题。
 
-[Change Logs for Issues and Pull requests](https://github.com/sharding-sphere/sharding-sphere/milestone/3)
+###  更新日志
+1. [MILESTONE #3](https://github.com/sharding-sphere/sharding-sphere/milestone/3)
+1. [MILESTONE #4](https://github.com/sharding-sphere/sharding-sphere/milestone/4)
+
 
 ## 3.0.0
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.shardingsphere</groupId>
     <artifactId>sharding-sphere</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/sharding-core/pom.xml b/sharding-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-core</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-jdbc/pom.xml b/sharding-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-jdbc</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-jdbc/sharding-jdbc-core/pom.xml b/sharding-jdbc/sharding-jdbc-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-jdbc</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-jdbc-core</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-jdbc/sharding-jdbc-orchestration/pom.xml b/sharding-jdbc/sharding-jdbc-orchestration/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-jdbc</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-jdbc-orchestration</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-opentracing/pom.xml b/sharding-opentracing/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-opentracing</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-orchestration/pom.xml b/sharding-orchestration/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-orchestration/sharding-orchestration-core/pom.xml b/sharding-orchestration/sharding-orchestration-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-orchestration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration-core</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-orchestration/sharding-orchestration-reg/pom.xml b/sharding-orchestration/sharding-orchestration-reg/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-orchestration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration-reg</artifactId>
     <name>${project.artifactId}</name>

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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-orchestration-reg</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration-reg-api</artifactId>
     <name>${project.artifactId}</name>

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
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-orchestration-reg</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration-reg-etcd</artifactId>
     <name>${project.artifactId}</name>

diff --git a/...estration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml b/...estration/sharding-orchestration-reg/sharding-orchestration-reg-zookeeper-curator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-orchestration-reg</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-proxy/pom.xml b/sharding-proxy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-proxy</artifactId>
     <name>${project.artifactId}</name>
@@ -88,7 +88,7 @@
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
-                    <imageName>shardingsphere/sharding-proxy:3.1.0-SNAPSHOT</imageName>
+                    <imageName>shardingsphere/sharding-proxy:3.1.0</imageName>
                     <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
                     <resources>
                         <resource>

diff --git a/sharding-proxy/src/main/docker/Dockerfile b/sharding-proxy/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM java:7
 MAINTAINER caohao "caohaoch@gmail.com"
 
-ADD sharding-proxy-3.1.0-SNAPSHOT.tar.gz /
-RUN mv /sharding-proxy-3.1.0-SNAPSHOT /opt/sharding-proxy
+ADD sharding-proxy-3.1.0.tar.gz /
+RUN mv /sharding-proxy-3.1.0 /opt/sharding-proxy
 ENTRYPOINT /opt/sharding-proxy/bin/start.sh $PORT && tail -f /opt/sharding-proxy/logs/stdout.log
diff --git a/...xy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ServerInfo.java b/...xy/src/main/java/io/shardingsphere/shardingproxy/transport/mysql/constant/ServerInfo.java
@@ -36,7 +36,7 @@ public final class ServerInfo {
     /**
      * Server version.
      */
-    public static final String SERVER_VERSION = "5.6.0-Sharding-Proxy 3.1.0-SNAPSHOT";
+    public static final String SERVER_VERSION = "5.6.0-Sharding-Proxy 3.1.0";
 
     /**
      * Charset code 0x21 is utf8_general_ci.

diff --git a/sharding-sql-test/pom.xml b/sharding-sql-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-sql-test</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/pom.xml b/sharding-transaction/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-sphere</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/sharding-transaction-2pc/pom.xml b/sharding-transaction/sharding-transaction-2pc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sharding-transaction</artifactId>
         <groupId>io.shardingsphere</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction-2pc</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/sharding-transaction-2pc/sharding-transaction-2pc-spi/pom.xml b/sharding-transaction/sharding-transaction-2pc/sharding-transaction-2pc-spi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sharding-transaction-2pc</artifactId>
         <groupId>io.shardingsphere</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction-2pc-spi</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/sharding-transaction-2pc/sharding-transaction-2pc-xa/pom.xml b/sharding-transaction/sharding-transaction-2pc/sharding-transaction-2pc-xa/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-transaction-2pc</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction-2pc-xa</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/sharding-transaction-base/pom.xml b/sharding-transaction/sharding-transaction-base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-transaction</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction-base</artifactId>
     <name>${project.artifactId}</name>

diff --git a/sharding-transaction/sharding-transaction-core/pom.xml b/sharding-transaction/sharding-transaction-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.shardingsphere</groupId>
         <artifactId>sharding-transaction</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
     <artifactId>sharding-transaction-core</artifactId>
     <name>${project.artifactId}</name>