From 8b4f46251c812f8ab5796ce1a0976dc94f5236eb Mon Sep 17 00:00:00 2001
From: Lei Zhiyuan <leizhiyuan@gmail.com>
Date: Mon, 16 Sep 2019 18:19:19 +0800
Subject: [PATCH] Prepare release 604. (#202)

* change change version

* change version 6.0.4

* trigger flow

* fix travis ci
---
 .travis.yml               | 6 ++++++
 pom.xml                   | 3 ++-
 sofa-boot-core/pom.xml    | 2 +-
 sofa-boot-plugin/pom.xml  | 2 +-
 sofa-boot-samples/pom.xml | 4 ++--
 sofa-boot-starter/pom.xml | 4 ++--
 tools/change_version.sh   | 3 ---
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b13cb55..2255c23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,15 @@
 #.travis.yml
 language: java
 
+dist: trusty
+
 jdk:
   - oraclejdk8
 
+cache:
+  directories:
+    - $HOME/.m2
+
 before_install:
   - echo "Install Zookeeper 3.4.11"
    && wget http://archive.apache.org/dist/zookeeper/zookeeper-3.4.11/zookeeper-3.4.11.tar.gz
diff --git a/pom.xml b/pom.xml
index 9b466e6..bdbc1b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>sofa-rpc-boot-projects</artifactId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -137,6 +137,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/sofa-boot-core/pom.xml b/sofa-boot-core/pom.xml
index ece0e00..4e80631 100644
--- a/sofa-boot-core/pom.xml
+++ b/sofa-boot-core/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rpc-sofa-boot-core</artifactId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
 
     <url>https://github.com/sofastack/sofa-rpc</url>
 
diff --git a/sofa-boot-plugin/pom.xml b/sofa-boot-plugin/pom.xml
index 7e8e0ea..51c845a 100644
--- a/sofa-boot-plugin/pom.xml
+++ b/sofa-boot-plugin/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rpc-sofa-boot-plugin</artifactId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
 
     <properties>
         <ark.plugin.name>rpc-sofa-boot-plugin</ark.plugin.name>
diff --git a/sofa-boot-samples/pom.xml b/sofa-boot-samples/pom.xml
index 724e038..bf57e55 100644
--- a/sofa-boot-samples/pom.xml
+++ b/sofa-boot-samples/pom.xml
@@ -7,14 +7,14 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofa-rpc-boot-projects</artifactId>
-        <version>6.0.4-SNAPSHOT</version>
+        <version>6.0.4</version>
     </parent>
 
     <properties>
         <dubbo_version>2.4.10</dubbo_version>
         <cxf.version>3.0.14</cxf.version>
         <sofaboot.version>3.1.4</sofaboot.version>
-        <rpc.starter.version>6.0.4-SNAPSHOT</rpc.starter.version>
+        <rpc.starter.version>6.0.4</rpc.starter.version>
         <curator-test.version>2.9.1</curator-test.version>
         <junit.version>4.12</junit.version>
         <spring-boot-starter-test.version>1.4.2.RELEASE</spring-boot-starter-test.version>
diff --git a/sofa-boot-starter/pom.xml b/sofa-boot-starter/pom.xml
index 7257543..2301fed 100644
--- a/sofa-boot-starter/pom.xml
+++ b/sofa-boot-starter/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rpc-sofa-boot-starter</artifactId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
 
     <url>https://github.com/sofastack/sofa-rpc</url>
 
@@ -18,7 +18,7 @@
         <java.version>1.8</java.version>
         <project.build.encoding>UTF-8</project.build.encoding>
         <skipTests>false</skipTests>
-        <rpc.starter.version>6.0.4-SNAPSHOT</rpc.starter.version>
+        <rpc.starter.version>6.0.4</rpc.starter.version>
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <license-maven-plugin.version>3.0</license-maven-plugin.version>
diff --git a/tools/change_version.sh b/tools/change_version.sh
index 9aa91fa..e671dca 100644
--- a/tools/change_version.sh
+++ b/tools/change_version.sh
@@ -21,7 +21,6 @@ echo "Change version in root pom.xml ===>"
 sed "/<project /,/<name/ s/<version>[^\$].*<\/version>/<version>$1<\/version>/" $shellDir/../pom.xml
 
 echo "Change rpc version in sofa-boot-core(if not same, please modify it) ===>"
-sed "s/<rpc.all.version>.*<\/rpc.all.version>/<rpc.all.version>$1<\/rpc.all.version>/" $shellDir/../sofa-boot-core/pom.xml
 
 echo "Change version in sofa-boot-core ===>"
 sed "/\/parent/,/<properties/ s/<version>[^\$].*<\/version>/<version>$1<\/version>/" $shellDir/../sofa-boot-core/pom.xml
@@ -40,5 +39,3 @@ sed "s/<rpc.starter.version>.*<\/rpc.starter.version>/<rpc.starter.version>$1<\/
 echo "Change rpc version in sofa-boot-plugin ===>"
 sed "s/<rpc.starter.version>.*<\/rpc.starter.version>/<rpc.starter.version>$1<\/rpc.starter.version>/" $shellDir/../sofa-boot-plugin/pom.xml
 sed "/\/parent/,/<properties/ s/<version>[^\$].*<\/version>/<version>$1<\/version>/" $shellDir/../sofa-boot-plugin/pom.xml
-sed "s/<rpc.all.version>.*<\/rpc.all.version>/<rpc.all.version>$1<\/rpc.all.version>/" $shellDir/../sofa-boot-plugin/pom.xml
-