Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
d57dd58a
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d57dd58a
编写于
4月 28, 2016
作者:
J
Jason Song
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #155 from yiming187/jenkins_update
Update jenkins build
上级
bf6ff487
ab6baf9c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
46 addition
and
14 deletion
+46
-14
.gitignore
.gitignore
+0
-2
apollo-adminservice/src/main/scripts/shutdown.sh
apollo-adminservice/src/main/scripts/shutdown.sh
+3
-2
apollo-biz/src/main/resources/application-dev.example.properties
...biz/src/main/resources/application-dev.example.properties
+0
-4
apollo-biz/src/main/resources/application-dev.properties
apollo-biz/src/main/resources/application-dev.properties
+4
-0
apollo-buildtools/pom.xml
apollo-buildtools/pom.xml
+24
-0
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
+2
-2
apollo-configservice/src/main/scripts/shutdown.sh
apollo-configservice/src/main/scripts/shutdown.sh
+3
-1
apollo-portal/src/main/scripts/shutdown.sh
apollo-portal/src/main/scripts/shutdown.sh
+3
-1
pom.xml
pom.xml
+7
-2
未找到文件。
.gitignore
浏览文件 @
d57dd58a
...
...
@@ -24,5 +24,3 @@ target
# git
*.orig
application-dev.properties
\ No newline at end of file
apollo-adminservice/src/main/scripts/shutdown.sh
浏览文件 @
d57dd58a
...
...
@@ -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
apollo-biz/src/main/resources/application-dev.example.properties
已删除
100644 → 0
浏览文件 @
bf6ff487
# DataSource
spring.datasource.url
=
spring.datasource.username =
spring.datasource.password
=
apollo-biz/src/main/resources/application-dev.properties
0 → 100644
浏览文件 @
d57dd58a
# DataSource
spring.datasource.url
=
${spring_datasource_url}
spring.datasource.username
=
${spring_datasource_username}
spring.datasource.password
=
${spring_datasource_password}
apollo-buildtools/pom.xml
浏览文件 @
d57dd58a
...
...
@@ -20,4 +20,28 @@
<artifactId>
cat-client
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>
maven-resources-plugin
</artifactId>
<executions>
<execution>
<id>
copy-resources
</id>
<phase>
validate
</phase>
<goals>
<goal>
copy-resources
</goal>
</goals>
<configuration>
<outputDirectory>
${basedir}/target
</outputDirectory>
<resources>
<resource>
<directory>
src/main/scripts
</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
apollo-buildtools/src/main/scripts/deploy_jenkins.sh
浏览文件 @
d57dd58a
...
...
@@ -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_SCRIPT
S
=
$APP_DIR
/bin/shutdown.sh
APP_SHUTDOWN_SCRIPT
=
$APP_DIR
/bin/shutdown.sh
if
[
-e
$APP_STARTUP_SCRIPT
]
;
then
$APP_SHUTDOWN_SCRIPT
S
$APP_SHUTDOWN_SCRIPT
fi
mkdir
-p
$APP_RELEASE_DIR
...
...
apollo-configservice/src/main/scripts/shutdown.sh
浏览文件 @
d57dd58a
...
...
@@ -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
apollo-portal/src/main/scripts/shutdown.sh
浏览文件 @
d57dd58a
...
...
@@ -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
pom.xml
浏览文件 @
d57dd58a
...
...
@@ -292,6 +292,11 @@
<artifactId>
maven-release-plugin
</artifactId>
<version>
2.5.3
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-jar-plugin
</artifactId>
<version>
2.6
</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
...
...
@@ -369,9 +374,9 @@
</build>
</profile>
<profile>
<id>
local
</id>
<id>
dev
</id>
<properties>
<package.environment>
local
</package.environment>
<package.environment>
dev
</package.environment>
</properties>
<activation>
<activeByDefault>
true
</activeByDefault>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录