From 3617c441b10e0fed25681cb0f0bd2e7d6ac37f07 Mon Sep 17 00:00:00 2001 From: benjobs Date: Sun, 23 Apr 2017 14:42:00 +0800 Subject: [PATCH] =?UTF-8?q?1.0-RELEASE=E7=89=88=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 111 ------------------------ opencron-agent/pom.xml | 2 +- opencron-agent/src/conf/bin/opencron.sh | 2 +- opencron-common/pom.xml | 2 +- opencron-server/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 5 insertions(+), 116 deletions(-) delete mode 100755 build.sh diff --git a/build.sh b/build.sh deleted file mode 100755 index c4141119..00000000 --- a/build.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/bash - -# Name: doDeploy.sh -#Execute this shell script to deploy Java projects built by Maven automatically on remote hosts. - -# debug option -DEBUG=false -#DEBUG=true - -if $DEBUG ; then - old_PS4=$PS4 -# export PS4='+${BASH_SOURCE}:${LINENO}:${FUNCNAME[0]}: ' - export PS4='+${LINENO}: ${FUNCNAME[0]}: ' # if there is only one bash script, do not display ${BASH_SOURCE} - _XTRACE_FUNCTIONS=$(set +o | grep xtrace) - set -o xtrace -fi - -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -# echo color function, smarter, learn from lnmp.org lnmp install.sh -function echo_r (){ - # Color red: Error, Failed - [ $# -ne 1 ] && return 1 - echo -e "\033[31m$1\033[0m" -} -function echo_g (){ - # Color green: Success - [ $# -ne 1 ] && return 1 - echo -e "\033[32m$1\033[0m" -} -function echo_y (){ - # Color yellow: Warning - [ $# -ne 1 ] && return 1 - echo -e "\033[33m$1\033[0m" -} -function echo_b (){ - # Color blue: Debug Level 1 - [ $# -ne 1 ] && return 1 - echo -e "\033[34m$1\033[0m" -} - -function echo_p (){ - # Color purple,magenta: Debug Level 2 - [ $# -ne 1 ] && return 1 - echo -e "\033[35m$1\033[0m" -} - -function echo_c (){ - # Color cyan: friendly prompt, Level 1 - [ $# -ne 1 ] && return 1 - echo -e "\033[36m$1\033[0m" -} -# end echo color function, smarter - -#WORKDIR="`realpath ${WORKDIR}`" -WORKDIR="`readlink -f ${PRGDIR}`" - -# end public header -# ============================================================================================================================= - -USER="`id -un`" -LOGNAME="$USER" -if [ $UID -ne 0 ]; then - echo "WARNING: Running as a non-root user, \"$LOGNAME\". Functionality may be unavailable. Only root can use some commands or options" -fi - - -function build(){ - echo_b "Do mvn build java project for `echo $1 | awk -F '[/.]+' '{ print $(NF-1)}'`... " - - mvn install >>${WORKDIR}/mvn_build_$(date +%Y%m%d)_$$.log 2>&1 - retval=$? - if [ ${retval} -ne 0 ] ; then - echo_r "mvn install failed! More details refer to ${WORKDIR}/mvn_build_$(date +%Y%m%d)_$$.log" - exit 1 - else - echo_g "mvn install for ${project_clone_repository_name} successfully! " - fi - - mvn clean package >>${WORKDIR}/mvn_build_$(date +%Y%m%d)_$$.log 2>&1 - retval=$? - if [ ${retval} -ne 0 ] ; then - echo_r "mvn clean package for ${project_clone_repository_name} failed! More details refer to ${WORKDIR}/mvn_build_$(date +%Y%m%d)_$$.log" - exit 1 - else - echo_g "mvn clean package for ${project_clone_repository_name} successfully! " - fi - cd ${WORKDIR} - echo_g "Do mvn build java project finished for ${project_clone_repository_name} with exit code 0! " - echo -} - -# debug option -if $DEBUG ; then - export PS4=$old_PS4 - ${_XTRACE_FUNCTIONS} -fi - diff --git a/opencron-agent/pom.xml b/opencron-agent/pom.xml index 3166f3e9..5643419b 100755 --- a/opencron-agent/pom.xml +++ b/opencron-agent/pom.xml @@ -3,7 +3,7 @@ opencron org.opencron - 1.0-RELEASE + 1.0.1-RELEASE 4.0.0 opencron-agent diff --git a/opencron-agent/src/conf/bin/opencron.sh b/opencron-agent/src/conf/bin/opencron.sh index 09059cce..cee76fdc 100755 --- a/opencron-agent/src/conf/bin/opencron.sh +++ b/opencron-agent/src/conf/bin/opencron.sh @@ -182,7 +182,7 @@ OPENCRON_PID="$OPENCRON_PIDDIR/opencron.pid"; OPENCRON_SHUTDOWNPORT=15707 #opencron version -OPENCRON_VERSION="1.0-RELEASE" +OPENCRON_VERSION="1.0.1-RELEASE" # Add bootstrap.jar to classpath # bootstrap can be over-ridden per instance diff --git a/opencron-common/pom.xml b/opencron-common/pom.xml index e3529b1e..52380ee7 100644 --- a/opencron-common/pom.xml +++ b/opencron-common/pom.xml @@ -5,7 +5,7 @@ opencron org.opencron - 1.0-RELEASE + 1.0.1-RELEASE 4.0.0 opencron-common diff --git a/opencron-server/pom.xml b/opencron-server/pom.xml index 7881f729..7962b49e 100644 --- a/opencron-server/pom.xml +++ b/opencron-server/pom.xml @@ -3,7 +3,7 @@ opencron org.opencron - 1.0-RELEASE + 1.0.1-RELEASE 4.0.0 opencron-server diff --git a/pom.xml b/pom.xml index bd0de8ae..255bbe42 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.opencron opencron - 1.0-RELEASE + 1.0.1-RELEASE opencron-common opencron-agent