diff --git a/README.md b/README.md index 176e4af77..1681c4fa3 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ ![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 框架及其周边组件提供丰富的微服务治理方案。 ## 功能特性 @@ -14,7 +12,7 @@ SOFARPC 是一个高可扩展性、高性能、生产级的 Java RPC 框架。 - 透明化、高性能的远程服务调用 - 支持多种服务路由及负载均衡策略 - 支持多种注册中心的集成 -- 支持多种协议 +- 支持多种协议，包括 Bolt、Rest、Dubbo 等 - 支持同步、单向、回调、泛化等多种调用方式 - 支持集群容错、服务预热、自动故障隔离 - 强大的扩展功能，可以按需扩展各个功能组件 diff --git a/all/pom.xml b/all/pom.xml index 40dfa36d2..ea5e61606 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -6,7 +6,7 @@ com.alipay.sofa sofa-rpc-all - 5.3.2 + 5.3.3 ${project.groupId}:${project.artifactId} http://github.com/alipay/sofa-rpc diff --git a/bom/pom.xml b/bom/pom.xml index 67f403dd1..e1b382a6f 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ com.alipay.sofa sofa-rpc-bom - 5.3.2 + 5.3.3 pom diff --git a/core-impl/client/pom.xml b/core-impl/client/pom.xml index 89bed0e1c..6b435f619 100644 --- a/core-impl/client/pom.xml +++ b/core-impl/client/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core-impl - 5.3.2 + 5.3.3 sofa-rpc-client diff --git a/core-impl/codec/pom.xml b/core-impl/codec/pom.xml index 2d7bd0f67..fd557c9e2 100644 --- a/core-impl/codec/pom.xml +++ b/core-impl/codec/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core-impl - 5.3.2 + 5.3.3 sofa-rpc-codec diff --git a/core-impl/filter/pom.xml b/core-impl/filter/pom.xml index 057278e16..445e6a590 100644 --- a/core-impl/filter/pom.xml +++ b/core-impl/filter/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core-impl - 5.3.2 + 5.3.3 sofa-rpc-filter diff --git a/core-impl/log/pom.xml b/core-impl/log/pom.xml index 4681518e5..a92484d64 100644 --- a/core-impl/log/pom.xml +++ b/core-impl/log/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core-impl - 5.3.2 + 5.3.3 sofa-rpc-log diff --git a/core-impl/pom.xml b/core-impl/pom.xml index efb6bf3c3..0cb718c43 100644 --- a/core-impl/pom.xml +++ b/core-impl/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 sofa-rpc-core-impl diff --git a/core-impl/proxy/pom.xml b/core-impl/proxy/pom.xml index f0935a43f..435813fe8 100644 --- a/core-impl/proxy/pom.xml +++ b/core-impl/proxy/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core-impl - 5.3.2 + 5.3.3 sofa-rpc-proxy diff --git a/core-impl/transport/pom.xml b/core-impl/transport/pom.xml index 09867a922..960f03dbf 100644 --- a/core-impl/transport/pom.xml +++ b/core-impl/transport/pom.xml @@ -6,7 +6,7 @@ sofa-rpc-core-impl com.alipay.sofa - 5.3.2 + 5.3.3 sofa-rpc-transport diff --git a/core/api/pom.xml b/core/api/pom.xml index 25a4fe0e7..5b2a4e8f8 100644 --- a/core/api/pom.xml +++ b/core/api/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core - 5.3.2 + 5.3.3 sofa-rpc-api 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 index 4c6033883..25feb8d69 100644 --- 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 index 6055a8557..bf9424bce 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core - 5.3.2 + 5.3.3 sofa-rpc-common diff --git a/core/exception/pom.xml b/core/exception/pom.xml index 755121588..7ecb48ac0 100644 --- a/core/exception/pom.xml +++ b/core/exception/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-core - 5.3.2 + 5.3.3 sofa-rpc-exception diff --git a/core/pom.xml b/core/pom.xml index 3e99a1dc3..4261da9e5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 sofa-rpc-core diff --git a/example/pom.xml b/example/pom.xml index e9ac2c9d3..036fda1df 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 sofa-rpc-example diff --git a/extension-impl/api-compatible/pom.xml b/extension-impl/api-compatible/pom.xml index 096227035..e5003149c 100644 --- a/extension-impl/api-compatible/pom.xml +++ b/extension-impl/api-compatible/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-api-compatible diff --git a/extension-impl/bootstrap-bolt/pom.xml b/extension-impl/bootstrap-bolt/pom.xml index 3307d029a..6658a58a0 100644 --- a/extension-impl/bootstrap-bolt/pom.xml +++ b/extension-impl/bootstrap-bolt/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-bootstrap-bolt diff --git a/extension-impl/bootstrap-dubbo/pom.xml b/extension-impl/bootstrap-dubbo/pom.xml index 1635c008a..46de0a829 100644 --- a/extension-impl/bootstrap-dubbo/pom.xml +++ b/extension-impl/bootstrap-dubbo/pom.xml @@ -7,7 +7,7 @@ sofa-rpc-extension-impl com.alipay.sofa - 5.3.2 + 5.3.3 sofa-rpc-bootstrap-dubbo diff --git a/extension-impl/bootstrap-rest/pom.xml b/extension-impl/bootstrap-rest/pom.xml index 2fc911ef1..8980426af 100644 --- a/extension-impl/bootstrap-rest/pom.xml +++ b/extension-impl/bootstrap-rest/pom.xml @@ -7,7 +7,7 @@ sofa-rpc-extension-impl com.alipay.sofa - 5.3.2 + 5.3.3 sofa-rpc-bootstrap-rest diff --git a/extension-impl/extension-common/pom.xml b/extension-impl/extension-common/pom.xml index a8b0bb8db..3ea43d265 100644 --- a/extension-impl/extension-common/pom.xml +++ b/extension-impl/extension-common/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-extension-common diff --git a/extension-impl/fault-tolerance/pom.xml b/extension-impl/fault-tolerance/pom.xml index 8f6fbda68..db090ded2 100644 --- a/extension-impl/fault-tolerance/pom.xml +++ b/extension-impl/fault-tolerance/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-fault-tolerance diff --git a/extension-impl/log-common-tools/pom.xml b/extension-impl/log-common-tools/pom.xml index 37e1d97b1..f21bd5ef3 100644 --- a/extension-impl/log-common-tools/pom.xml +++ b/extension-impl/log-common-tools/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-log-common-tools diff --git a/extension-impl/pom.xml b/extension-impl/pom.xml index c3c4c471d..5d0b7006d 100644 --- a/extension-impl/pom.xml +++ b/extension-impl/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 sofa-rpc-extension-impl diff --git a/extension-impl/registry-local/pom.xml b/extension-impl/registry-local/pom.xml index a0a12ebf0..cc864e713 100644 --- a/extension-impl/registry-local/pom.xml +++ b/extension-impl/registry-local/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-registry-local diff --git a/extension-impl/registry-zk/pom.xml b/extension-impl/registry-zk/pom.xml index 96a8a14c4..66425c8c3 100644 --- a/extension-impl/registry-zk/pom.xml +++ b/extension-impl/registry-zk/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-registry-zk diff --git a/extension-impl/remoting-bolt/pom.xml b/extension-impl/remoting-bolt/pom.xml index c34ed4f23..73c93fcda 100644 --- a/extension-impl/remoting-bolt/pom.xml +++ b/extension-impl/remoting-bolt/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-remoting-bolt diff --git a/extension-impl/remoting-resteasy/pom.xml b/extension-impl/remoting-resteasy/pom.xml index ff3b1e09f..b560b94c4 100644 --- a/extension-impl/remoting-resteasy/pom.xml +++ b/extension-impl/remoting-resteasy/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-extension-impl - 5.3.2 + 5.3.3 sofa-rpc-remoting-resteasy diff --git a/pom.xml b/pom.xml index c3401c66d..5ac985cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 pom [SOFA] - RPC Framework http://www.antfin.com diff --git a/test/pom.xml b/test/pom.xml index 0c98e3547..73450d59b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-parent - 5.3.2 + 5.3.3 sofa-rpc-test diff --git a/test/test-common/pom.xml b/test/test-common/pom.xml index 03115f402..dc699dd28 100644 --- a/test/test-common/pom.xml +++ b/test/test-common/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-test - 5.3.2 + 5.3.3 sofa-rpc-test-common diff --git a/test/test-integration-3rd/pom.xml b/test/test-integration-3rd/pom.xml index 8cb31bc4a..187f0facb 100644 --- a/test/test-integration-3rd/pom.xml +++ b/test/test-integration-3rd/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-test - 5.3.2 + 5.3.3 sofa-rpc-test-integration-3rd 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 index 17e0f1185..dc0e4cb0b 100644 --- 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 index 030a51d46..1906acf16 100644 --- a/test/test-integration/pom.xml +++ b/test/test-integration/pom.xml @@ -7,7 +7,7 @@ com.alipay.sofa sofa-rpc-test - 5.3.2 + 5.3.3 sofa-rpc-test-integration diff --git a/tools/change_version.sh b/tools/change_version.sh index 06df8f1c4..eb7941811 100644 --- 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