Prepare to release v5.3.3. (#150)

sofastack · May 30, 2018 · e711d81 · e711d81
1 parent aab9704
commit e711d81
Show file tree

Hide file tree

Showing 35 changed files with 43 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -5,16 +5,14 @@
 ![License](https://img.shields.io/badge/license-Apache--2.0-green.svg)
 [![Maven](https://img.shields.io/github/release/alipay/sofa-rpc.svg)](https://github.com/alipay/sofa-rpc/releases)
 
-## 概述
-
 SOFARPC 是一个高可扩展性、高性能、生产级的 Java RPC 框架。在蚂蚁金服 SOFARPC 已经经历了十多年及五代版本的发展。SOFARPC 致力于简化应用之间的 RPC 调用，为应用提供方便透明、稳定高效的点对点远程服务调用方案。为了用户和开发者方便的进行功能扩展，SOFARPC 提供了丰富的模型抽象和可扩展接口，包括过滤器、路由、负载均衡等等。同时围绕 SOFARPC 框架及其周边组件提供丰富的微服务治理方案。
 
 ## 功能特性
 
 - 透明化、高性能的远程服务调用
 - 支持多种服务路由及负载均衡策略
 - 支持多种注册中心的集成
-- 支持多种协议
+- 支持多种协议，包括 Bolt、Rest、Dubbo 等
 - 支持同步、单向、回调、泛化等多种调用方式
 - 支持集群容错、服务预热、自动故障隔离
 - 强大的扩展功能，可以按需扩展各个功能组件

diff --git a/all/pom.xml b/all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-all</artifactId>
-    <version>5.3.2</version>
+    <version>5.3.3</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-rpc</url>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-bom</artifactId>
-    <version>5.3.2</version>
+    <version>5.3.3</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/core-impl/client/pom.xml b/core-impl/client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-client</artifactId>

diff --git a/core-impl/codec/pom.xml b/core-impl/codec/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-codec</artifactId>

diff --git a/core-impl/filter/pom.xml b/core-impl/filter/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-filter</artifactId>

diff --git a/core-impl/log/pom.xml b/core-impl/log/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-log</artifactId>

diff --git a/core-impl/pom.xml b/core-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-core-impl</artifactId>

diff --git a/core-impl/proxy/pom.xml b/core-impl/proxy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-proxy</artifactId>

diff --git a/core-impl/transport/pom.xml b/core-impl/transport/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>sofa-rpc-core-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-transport</artifactId>

diff --git a/core/api/pom.xml b/core/api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-api</artifactId>

diff --git a/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java b/core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java
@@ -27,15 +27,15 @@ public final class Version {
     /**
      * 当前RPC版本，例如：5.6.7
      */
-    public static final String VERSION       = "5.3.2";
+    public static final String VERSION       = "5.3.3";
 
     /**
      * 当前RPC版本，例如： 5.6.7 对应 50607
      */
-    public static final int    RPC_VERSION   = 50302;
+    public static final int    RPC_VERSION   = 50303;
 
     /**
      * 当前Build版本，每次发布修改
      */
-    public static final String BUILD_VERSION = "5.3.2_20180427180628";
+    public static final String BUILD_VERSION = "5.3.3_20180530221429";
 }
diff --git a/core/common/pom.xml b/core/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-common</artifactId>

diff --git a/core/exception/pom.xml b/core/exception/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-core</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-exception</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-core</artifactId>

diff --git a/example/pom.xml b/example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-example</artifactId>

diff --git a/extension-impl/api-compatible/pom.xml b/extension-impl/api-compatible/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-api-compatible</artifactId>

diff --git a/extension-impl/bootstrap-bolt/pom.xml b/extension-impl/bootstrap-bolt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-bolt</artifactId>

diff --git a/extension-impl/bootstrap-dubbo/pom.xml b/extension-impl/bootstrap-dubbo/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-dubbo</artifactId>

diff --git a/extension-impl/bootstrap-rest/pom.xml b/extension-impl/bootstrap-rest/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>sofa-rpc-extension-impl</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-bootstrap-rest</artifactId>

diff --git a/extension-impl/extension-common/pom.xml b/extension-impl/extension-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-extension-common</artifactId>

diff --git a/extension-impl/fault-tolerance/pom.xml b/extension-impl/fault-tolerance/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-fault-tolerance</artifactId>

diff --git a/extension-impl/log-common-tools/pom.xml b/extension-impl/log-common-tools/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-log-common-tools</artifactId>

diff --git a/extension-impl/pom.xml b/extension-impl/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-extension-impl</artifactId>

diff --git a/extension-impl/registry-local/pom.xml b/extension-impl/registry-local/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-local</artifactId>

diff --git a/extension-impl/registry-zk/pom.xml b/extension-impl/registry-zk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-registry-zk</artifactId>

diff --git a/extension-impl/remoting-bolt/pom.xml b/extension-impl/remoting-bolt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-remoting-bolt</artifactId>

diff --git a/extension-impl/remoting-resteasy/pom.xml b/extension-impl/remoting-resteasy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-extension-impl</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-remoting-resteasy</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-parent</artifactId>
-    <version>5.3.2</version>
+    <version>5.3.3</version>
     <packaging>pom</packaging>
     <name>[SOFA] - RPC Framework</name>
     <url>http://www.antfin.com</url>

diff --git a/test/pom.xml b/test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-parent</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-test</artifactId>

diff --git a/test/test-common/pom.xml b/test/test-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-test</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-test-common</artifactId>

diff --git a/test/test-integration-3rd/pom.xml b/test/test-integration-3rd/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-test</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-test-integration-3rd</artifactId>

diff --git a/test/test-integration-3rd/src/test/java/com/alipay/sofa/rpc/registry/zk/WarmUpTest.java b/test/test-integration-3rd/src/test/java/com/alipay/sofa/rpc/registry/zk/WarmUpTest.java
@@ -59,6 +59,7 @@ public void testWarmUp() throws InterruptedException {
             .setRef(new WarmUpServiceImpl(22111))
             .setServer(serverConfig2)
             .setRegistry(registryConfig)
+            .setRepeatedExportLimit(-1)
             .setWeight(0);
 
         providerConfig.export();

diff --git a/test/test-integration/pom.xml b/test/test-integration/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-test</artifactId>
-        <version>5.3.2</version>
+        <version>5.3.3</version>
     </parent>
 
     <artifactId>sofa-rpc-test-integration</artifactId>

diff --git a/tools/change_version.sh b/tools/change_version.sh
@@ -52,8 +52,9 @@ if [ -f $version_java_file ]; then
     echo " WARN: You need to modify \"core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java\" "
     echo "=================="
 
-    echo "VERSION is $1"
-    sed -i ""  "s/\(VERSION[ ]*=[ ]*\"\).*$/\1$1\";/g" $version_java_file
+    version_str=$(echo $1 | \sed -e "s/[^0-9\.]//g")
+    echo "VERSION is ${version_str}"
+    sed "s/\(VERSION[ ]*=[ ]*\"\).*$/\1${version_str}\";/g" $version_java_file
 
     # number and dot -> padding bugfix version -> padding minor version -> padding major version -> only leave number
     rpc_version=$(echo $1 | \sed -e "s/[^0-9\.]//g" \
@@ -62,9 +63,10 @@ if [ -f $version_java_file ]; then
         -e "s/^\([0-9]\)\./\1\./g" \
         -e "s/[^0-9]//g")
     echo "RPC_VERSION is ${rpc_version}"
-    sed -i ""  "s/\(RPC_VERSION[ ]*=[ ]*\).*$/\1${rpc_version};/g" $version_java_file
+    sed "s/\(RPC_VERSION[ ]*=[ ]*\).*$/\1${rpc_version};/g" $version_java_file
 
     date_format=$(date  +"%Y%m%d%H%M%S")
-    echo "BUILD_VERSION is $1_${date_format}"
-    sed -i ""  "s/\(BUILD_VERSION[ ]*=[ ]*\"\).*$/\1$1_${date_format}\";/g" $version_java_file
+    build_version=${version_str}_${date_format}
+    echo "BUILD_VERSION is ${build_version}"
+    sed "s/\(BUILD_VERSION[ ]*=[ ]*\"\).*$/\1${build_version}\";/g" $version_java_file
 fi