diff --git a/.gitignore b/.gitignore index 3f5e17ddf77eeb0dc9e0a7e6b3ad74805238843c..d424b39725e0a7304e5145acc6f57b24971e6815 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,3 @@ target # git *.orig - -application-dev.properties \ No newline at end of file diff --git a/apollo-adminservice/src/main/scripts/shutdown.sh b/apollo-adminservice/src/main/scripts/shutdown.sh index 0acc1c48917be7952770c36d680a995acaf42a63..bd02f4dab7857b995ce0fc73b5c1f81f929f2c79 100644 --- a/apollo-adminservice/src/main/scripts/shutdown.sh +++ b/apollo-adminservice/src/main/scripts/shutdown.sh @@ -2,5 +2,6 @@ SERVICE_NAME=apollo-adminservice cd `dirname $0`/.. -./$SERVICE_NAME".jar" stop - +if [[ -f $SERVICE_NAME".jar" ]]; then + ./$SERVICE_NAME".jar" stop +fi diff --git a/apollo-biz/src/main/resources/application-dev.example.properties b/apollo-biz/src/main/resources/application-dev.example.properties deleted file mode 100644 index 5cbb49fbeba23e74ca48f40099697c9cfb52555d..0000000000000000000000000000000000000000 --- a/apollo-biz/src/main/resources/application-dev.example.properties +++ /dev/null @@ -1,4 +0,0 @@ -# DataSource -spring.datasource.url = -spring.datasource.username = -spring.datasource.password = diff --git a/apollo-biz/src/main/resources/application-dev.properties b/apollo-biz/src/main/resources/application-dev.properties new file mode 100644 index 0000000000000000000000000000000000000000..f4c35e6d289ddd80a565a0011bc43b86aa72efd1 --- /dev/null +++ b/apollo-biz/src/main/resources/application-dev.properties @@ -0,0 +1,4 @@ +# DataSource +spring.datasource.url = ${spring_datasource_url} +spring.datasource.username = ${spring_datasource_username} +spring.datasource.password = ${spring_datasource_password} diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml index 22f8abf96128980dfecf4060f1e37b2e57b39837..144c26ce0ac5b9f44a1b9e1596e9a818718d074d 100644 --- a/apollo-buildtools/pom.xml +++ b/apollo-buildtools/pom.xml @@ -20,4 +20,28 @@ cat-client + + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target + + + src/main/scripts + + + + + + + + diff --git a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh index b52af2da48f420144e123cf53094212d6521ac60..1694cbd88816c936621a875957e58b7d636ae64d 100644 --- a/apollo-buildtools/src/main/scripts/deploy_jenkins.sh +++ b/apollo-buildtools/src/main/scripts/deploy_jenkins.sh @@ -28,10 +28,10 @@ APP_NAME=$1 APP_DIR=$APP_BASE_DIR/$APP_NAME APP_RELEASE_DIR=$APP_BASE_DIR/apollo-$APP_NAME.releases/`date "+%Y-%m-%d.%H.%M.%S"` APP_STARTUP_SCRIPT=$APP_DIR/bin/startup.sh -APP_SHUTDOWN_SCRIPTS=$APP_DIR/bin/shutdown.sh +APP_SHUTDOWN_SCRIPT=$APP_DIR/bin/shutdown.sh if [ -e $APP_STARTUP_SCRIPT ];then - $APP_SHUTDOWN_SCRIPTS + $APP_SHUTDOWN_SCRIPT fi mkdir -p $APP_RELEASE_DIR diff --git a/apollo-configservice/src/main/scripts/shutdown.sh b/apollo-configservice/src/main/scripts/shutdown.sh index 30afb9e3302ab2eb811ef0798a7fe8d229cd8cea..0624ee86c32ba9538f7d0251033bf29dd754cacd 100644 --- a/apollo-configservice/src/main/scripts/shutdown.sh +++ b/apollo-configservice/src/main/scripts/shutdown.sh @@ -2,4 +2,6 @@ SERVICE_NAME=apollo-configservice cd `dirname $0`/.. -./$SERVICE_NAME".jar" stop \ No newline at end of file +if [[ -f $SERVICE_NAME".jar" ]]; then + ./$SERVICE_NAME".jar" stop +fi \ No newline at end of file diff --git a/apollo-portal/src/main/scripts/shutdown.sh b/apollo-portal/src/main/scripts/shutdown.sh index b5b61a5e651ef61a5d590a04f0a8962af5b6beb6..fb7ca3d3afa5d119f5706db3948e516ad6543612 100644 --- a/apollo-portal/src/main/scripts/shutdown.sh +++ b/apollo-portal/src/main/scripts/shutdown.sh @@ -2,4 +2,6 @@ SERVICE_NAME=apollo-portal cd `dirname $0`/.. -./$SERVICE_NAME".jar" stop \ No newline at end of file +if [[ -f $SERVICE_NAME".jar" ]]; then + ./$SERVICE_NAME".jar" stop +fi \ No newline at end of file diff --git a/pom.xml b/pom.xml index 92249fbba6d22d6dbc7a80f8907217a185e34509..8fe34f75963304d459e2ddde4168bae20c1d470d 100644 --- a/pom.xml +++ b/pom.xml @@ -292,6 +292,11 @@ maven-release-plugin 2.5.3 + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + @@ -369,9 +374,9 @@ - local + dev - local + dev true