Skip to content

Commit

Permalink
Fix Jenkins build
Browse files Browse the repository at this point in the history
  • Loading branch information
yiming187 committed May 17, 2016
1 parent 6f85eca commit 3cef854
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 12 deletions.
2 changes: 0 additions & 2 deletions apollo-assembly/src/main/scripts/adminservice/run_args.sh

This file was deleted.

2 changes: 2 additions & 0 deletions apollo-assembly/src/main/scripts/adminservice/services.sh
@@ -0,0 +1,2 @@
#!/bin/bash
SERVICES='--adminservice'
2 changes: 0 additions & 2 deletions apollo-assembly/src/main/scripts/configservice/run_args.sh

This file was deleted.

2 changes: 2 additions & 0 deletions apollo-assembly/src/main/scripts/configservice/services.sh
@@ -0,0 +1,2 @@
#!/bin/bash
SERVICES='--configservice'
2 changes: 0 additions & 2 deletions apollo-assembly/src/main/scripts/portal/run_args.sh

This file was deleted.

2 changes: 2 additions & 0 deletions apollo-assembly/src/main/scripts/portal/services.sh
@@ -0,0 +1,2 @@
#!/bin/bash
SERVICES='--portal'
2 changes: 0 additions & 2 deletions apollo-assembly/src/main/scripts/run_args.sh

This file was deleted.

2 changes: 2 additions & 0 deletions apollo-assembly/src/main/scripts/services.sh
@@ -0,0 +1,2 @@
#!/bin/bash
SERVICES='--configservice --adminservice --portal'
4 changes: 2 additions & 2 deletions apollo-assembly/src/main/scripts/startup.sh
Expand Up @@ -20,10 +20,10 @@ if [[ -f $SERVICE_NAME".jar" ]]; then
rm -rf $SERVICE_NAME".jar"
fi

source ./scripts/run_args.sh
source ./scripts/services.sh

ln $PATH_TO_JAR $SERVICE_NAME".jar"
chmod a+x $SERVICE_NAME".jar"
./$SERVICE_NAME".jar" start $RUN_ARGS
./$SERVICE_NAME".jar" start $SERVICES

exit 0;
1 change: 0 additions & 1 deletion apollo-buildtools/src/main/scripts/deploy_jenkins.sh
Expand Up @@ -44,7 +44,6 @@ ln -s $APP_RELEASE_DIR $APP_DIR

chmod +x $APP_STARTUP_SCRIPT
chmod +x $APP_SHUTDOWN_SCRIPT
env spring.profiles.active=dev bash
$APP_SHUTDOWN_SCRIPT
$APP_STARTUP_SCRIPT
wait
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -81,7 +81,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<jetty.version>9.3.8.v20160314</jetty.version>
<jetty.version>9.2.16.v20160414</jetty.version>
<github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties>
Expand Down

0 comments on commit 3cef854

Please sign in to comment.