Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
山不在高_有仙则灵
SkyWalking
提交
1b7ac0f4
S
SkyWalking
项目概览
山不在高_有仙则灵
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
12
Star
0
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
1b7ac0f4
编写于
3月 02, 2018
作者:
wu-sheng
提交者:
GitHub
3月 02, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into feature/Alarm
上级
fc5f67f0
766a78dd
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
28 addition
and
16 deletion
+28
-16
.gitignore
.gitignore
+1
-0
apm-dist/bin/collectorService.bat
apm-dist/bin/collectorService.bat
+0
-0
apm-dist/bin/collectorService.sh
apm-dist/bin/collectorService.sh
+0
-0
apm-dist/bin/startup.bat
apm-dist/bin/startup.bat
+0
-0
apm-dist/bin/startup.sh
apm-dist/bin/startup.sh
+0
-0
apm-dist/bin/webappService.bat
apm-dist/bin/webappService.bat
+0
-0
apm-dist/bin/webappService.sh
apm-dist/bin/webappService.sh
+0
-0
apm-dist/pom.xml
apm-dist/pom.xml
+10
-5
apm-dist/src/main/assembly/binary.xml
apm-dist/src/main/assembly/binary.xml
+6
-0
apm-sniffer/apm-agent/pom.xml
apm-sniffer/apm-agent/pom.xml
+5
-5
apm-sniffer/apm-sdk-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/pom.xml
+1
-1
apm-sniffer/apm-toolkit-activation/pom.xml
apm-sniffer/apm-toolkit-activation/pom.xml
+2
-2
apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
+1
-1
apm-sniffer/optional-plugins/pom.xml
apm-sniffer/optional-plugins/pom.xml
+1
-1
pom.xml
pom.xml
+1
-1
未找到文件。
.gitignore
浏览文件 @
1b7ac0f4
...
...
@@ -9,3 +9,4 @@ target/
*~
packages/
**/dependency-reduced-pom.xml
/skywalking-agent/
apm-
backend-
dist/bin/collectorService.bat
→
apm-dist/bin/collectorService.bat
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/bin/collectorService.sh
→
apm-dist/bin/collectorService.sh
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/bin/startup.bat
→
apm-dist/bin/startup.bat
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/bin/startup.sh
→
apm-dist/bin/startup.sh
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/bin/webappService.bat
→
apm-dist/bin/webappService.bat
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/bin/webappService.sh
→
apm-dist/bin/webappService.sh
浏览文件 @
1b7ac0f4
文件已移动
apm-
backend-
dist/pom.xml
→
apm-dist/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -14,6 +14,11 @@
<dependencies>
<dependency>
<groupId>
org.apache.skywalking
</groupId>
<artifactId>
apm-agent-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.apache.skywalking
</groupId>
<artifactId>
apm-collector-boot
</artifactId>
...
...
@@ -27,7 +32,7 @@
</dependencies>
<build>
<finalName>
skywalking-
backend
</finalName>
<finalName>
skywalking-
dist
</finalName>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
...
...
@@ -62,10 +67,10 @@
</goals>
<configuration>
<tasks>
<copy
file=
"${project.build.directory}/skywalking-
backend
.tar.gz"
tofile=
"${project.basedir}/../
packages/skywalking-backend
.tar.gz"
overwrite=
"true"
/>
<copy
file=
"${project.build.directory}/skywalking-
backend
.zip"
tofile=
"${project.basedir}/../
packages/skywalking-backend
.zip"
overwrite=
"true"
/>
<copy
file=
"${project.build.directory}/skywalking-
dist
.tar.gz"
tofile=
"${project.basedir}/../
dist/skywalking-dist
.tar.gz"
overwrite=
"true"
/>
<copy
file=
"${project.build.directory}/skywalking-
dist
.zip"
tofile=
"${project.basedir}/../
dist/skywalking-dist
.zip"
overwrite=
"true"
/>
</tasks>
</configuration>
</execution>
...
...
apm-
backend-
dist/src/main/assembly/binary.xml
→
apm-dist/src/main/assembly/binary.xml
浏览文件 @
1b7ac0f4
...
...
@@ -47,6 +47,12 @@
<directory>
${project.basedir}/../apm-collector/apm-collector-boot/target/skywalking-collector-assembly/skywalking-collector/libs
</directory>
<outputDirectory>
/collector-libs
</outputDirectory>
</fileSet>
<!-- Agent repackage into the dist -->
<fileSet>
<directory>
${project.basedir}/../skywalking-agent
</directory>
<outputDirectory>
/agent
</outputDirectory>
</fileSet>
</fileSets>
<files>
<file>
...
...
apm-sniffer/apm-agent/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -108,13 +108,13 @@
</goals>
<configuration>
<tasks>
<mkdir
dir=
"${project.basedir}/../../
packages/
skywalking-agent"
/>
<mkdir
dir=
"${project.basedir}/../../skywalking-agent"
/>
<copy
file=
"${project.build.directory}/skywalking-agent.jar"
tofile=
"${project.basedir}/../../
packages/
skywalking-agent/skywalking-agent.jar"
overwrite=
"true"
/>
<mkdir
dir=
"${project.basedir}/../../
packages/
skywalking-agent/config"
/>
<mkdir
dir=
"${project.basedir}/../../
packages/
skywalking-agent/logs"
/>
tofile=
"${project.basedir}/../../skywalking-agent/skywalking-agent.jar"
overwrite=
"true"
/>
<mkdir
dir=
"${project.basedir}/../../skywalking-agent/config"
/>
<mkdir
dir=
"${project.basedir}/../../skywalking-agent/logs"
/>
<copydir
src=
"${project.basedir}/../config"
dest=
"${project.basedir}/../../
packages/
skywalking-agent/config"
forceoverwrite=
"true"
/>
dest=
"${project.basedir}/../../skywalking-agent/config"
forceoverwrite=
"true"
/>
</tasks>
</configuration>
</execution>
...
...
apm-sniffer/apm-sdk-plugin/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -69,7 +69,7 @@
<shade.net.bytebuddy.source>
net.bytebuddy
</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>
${shade.package}.${shade.net.bytebuddy.source}
</shade.net.bytebuddy.target>
<agent.package.dest.dir>
${project.build.directory}${sdk.plugin.related.dir}/../../../../
packages/
skywalking-agent
</agent.package.dest.dir>
<agent.package.dest.dir>
${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
</agent.package.dest.dir>
<plugin.dest.dir>
${agent.package.dest.dir}/plugins
</plugin.dest.dir>
</properties>
...
...
apm-sniffer/apm-toolkit-activation/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -120,9 +120,9 @@
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
<then>
<mkdir
dir=
"${project.build.directory}/../../../../
packages/
skywalking-agent/plugins"
/>
<mkdir
dir=
"${project.build.directory}/../../../../skywalking-agent/plugins"
/>
<copy
file=
"${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile=
"${project.build.directory}/../../../../
packages/
skywalking-agent/activations/${project.artifactId}-${project.version}.jar"
overwrite=
"true"
/>
tofile=
"${project.build.directory}/../../../../skywalking-agent/activations/${project.artifactId}-${project.version}.jar"
overwrite=
"true"
/>
</then>
</if>
...
...
apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -30,7 +30,7 @@
<artifactId>
optional-spring-plugins
</artifactId>
<properties>
<plugin.dest.dir>
${project.build.directory}/../../../../../
packages/
skywalking-agent/optional-plugins
</plugin.dest.dir>
<plugin.dest.dir>
${project.build.directory}/../../../../../skywalking-agent/optional-plugins
</plugin.dest.dir>
</properties>
<modules>
...
...
apm-sniffer/optional-plugins/pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -33,7 +33,7 @@
<shade.net.bytebuddy.source>
net.bytebuddy
</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>
${shade.package}.${shade.net.bytebuddy.source}
</shade.net.bytebuddy.target>
<plugin.dest.dir>
${project.build.directory}/../../../../
packages/
skywalking-agent/optional-plugins
</plugin.dest.dir>
<plugin.dest.dir>
${project.build.directory}/../../../../skywalking-agent/optional-plugins
</plugin.dest.dir>
</properties>
<modules>
...
...
pom.xml
浏览文件 @
1b7ac0f4
...
...
@@ -64,7 +64,7 @@
<module>
apm-collector
</module>
<module>
apm-protocol
</module>
<module>
apm-webapp
</module>
<module>
apm-
backend-
dist
</module>
<module>
apm-dist
</module>
</modules>
<packaging>
pom
</packaging>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录