From 37b7ce58ae5e6544b36dcd6a9e89526f763e590c Mon Sep 17 00:00:00 2001
From: Geng Zhang <zhanggeng.zg@antfin.com>
Date: Thu, 31 May 2018 10:55:09 +0800
Subject: [PATCH] Prepare to release v5.4.0. (#152)

---
 all/pom.xml                                          |  2 +-
 bom/pom.xml                                          |  2 +-
 .../java/com/alipay/sofa/rpc/common/Version.java     |  2 +-
 extension-impl/metrics-lookout/pom.xml               |  2 +-
 extension-impl/remoting-http/pom.xml                 |  2 +-
 tools/change_version.sh                              | 12 +++++++-----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/all/pom.xml b/all/pom.xml
index 6db32948b..83fea7aff 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -57,7 +57,7 @@
         <hessian.version>3.3.0</hessian.version>
         <resteasy.version>3.0.12.Final</resteasy.version>
         <bolt.version>1.4.1</bolt.version>
-        <tracer.version>2.1.0</tracer.version>
+        <tracer.version>2.1.1</tracer.version>
         <lookout.version>1.4.0</lookout.version>
     </properties>
 
diff --git a/bom/pom.xml b/bom/pom.xml
index f9c7b47e7..a3f25b1b5 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -38,7 +38,7 @@
         <bolt.version>1.4.1</bolt.version>
         <sofa.common.tools.version>1.0.12</sofa.common.tools.version>
         <lookout.version>1.1.0</lookout.version>
-        <tracer.version>2.1.0</tracer.version>
+        <tracer.version>2.1.1</tracer.version>
         <lookout.version>1.4.0</lookout.version>
         <!-- Build args -->
         <module.install.skip>true</module.install.skip>
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 76f1f8ca8..748d0a816 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
@@ -37,5 +37,5 @@ public final class Version {
     /**
      * 当前Build版本，每次发布修改
      */
-    public static final String BUILD_VERSION = "5.4.0_20180427231325";
+    public static final String BUILD_VERSION = "5.4.0_20180530235405";
 }
diff --git a/extension-impl/metrics-lookout/pom.xml b/extension-impl/metrics-lookout/pom.xml
index 3e01968bb..650424b30 100644
--- a/extension-impl/metrics-lookout/pom.xml
+++ b/extension-impl/metrics-lookout/pom.xml
@@ -102,4 +102,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/extension-impl/remoting-http/pom.xml b/extension-impl/remoting-http/pom.xml
index 4ec2b5336..f2b4ec673 100644
--- a/extension-impl/remoting-http/pom.xml
+++ b/extension-impl/remoting-http/pom.xml
@@ -97,4 +97,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
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