Merge branch 'release' into 'develop'

Release

See merge request o2oa/o2oa!1745

o2server/start_aix.sh

@@ -132,17 +132,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_mips.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/
+		if [ -f ${current_dir}/start_arm.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_arm_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_arm.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/
+		if [ -f ${current_dir}/console_arm.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/
 		fi
 		cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/
 		rm -Rf ${current_dir}/local/update

o2server/start_arm.sh

@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/arm/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/arm/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file

o2server/start_arm_debug.sh

@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/arm/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
+setsid ${current_dir}/jvm/arm/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file