Merge branch 'master' into remove_ctrip_profile

apolloconfig · Aug 26, 2021 · a8d3941 · a8d3941
2 parents 5d91301 + e6d05fa
commit a8d3941
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,7 +5,10 @@ Release Notes.
 Apollo 1.10.0
 
 ------------------
+
 * [Bump version to 1.10.0](https://github.com/ctripcorp/apollo/pull/3917)
+* [Fix issue that the $ symbol is not used when reading shell variables](https://github.com/ctripcorp/apollo/pull/3890)
+* [Bump xstream from 1.4.17 to 1.4.18](https://github.com/apolloconfig/apollo/pull/3916)
 * [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920)
 
 ------------------

diff --git a/apollo-adminservice/src/main/scripts/startup.sh b/apollo-adminservice/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do

diff --git a/apollo-configservice/src/main/scripts/startup.sh b/apollo-configservice/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do

diff --git a/apollo-portal/src/main/scripts/startup.sh b/apollo-portal/src/main/scripts/startup.sh
@@ -120,7 +120,7 @@ do
     fi
 done
 
-if [[ ! -f PATH_TO_JAR && -d current ]]; then
+if [[ ! -f $PATH_TO_JAR && -d current ]]; then
     cd current
     for i in `ls $SERVICE_NAME-*.jar 2>/dev/null`
     do

diff --git a/pom.xml b/pom.xml
@@ -285,7 +285,7 @@
 			<dependency>
 				<groupId>com.thoughtworks.xstream</groupId>
 				<artifactId>xstream</artifactId>
-				<version>1.4.17</version>
+				<version>1.4.18</version>
 			</dependency>
 			<!--for test -->
 			<dependency>