Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
665a07cb
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
665a07cb
编写于
2月 24, 2021
作者:
Z
Zhenxu Ke
提交者:
GitHub
2月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up some warnings in maven build (#6426)
上级
96f1c121
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
45 addition
and
76 deletion
+45
-76
apm-dist-es7/pom.xml
apm-dist-es7/pom.xml
+3
-3
apm-dist-es7/src/main/assembly/binary-es7.xml
apm-dist-es7/src/main/assembly/binary-es7.xml
+10
-20
apm-dist/pom.xml
apm-dist/pom.xml
+3
-3
apm-dist/src/main/assembly/binary.xml
apm-dist/src/main/assembly/binary.xml
+10
-20
apm-sniffer/apm-agent-core/pom.xml
apm-sniffer/apm-agent-core/pom.xml
+2
-2
apm-sniffer/apm-agent/pom.xml
apm-sniffer/apm-agent/pom.xml
+4
-4
apm-sniffer/apm-sdk-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/pom.xml
+2
-2
apm-sniffer/apm-toolkit-activation/pom.xml
apm-sniffer/apm-toolkit-activation/pom.xml
+2
-2
apm-sniffer/bootstrap-plugins/pom.xml
apm-sniffer/bootstrap-plugins/pom.xml
+3
-3
apm-sniffer/optional-plugins/pom.xml
apm-sniffer/optional-plugins/pom.xml
+3
-3
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
...r/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
+3
-3
oap-server/server-library/library-util/pom.xml
oap-server/server-library/library-util/pom.xml
+0
-5
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto
...main/proto/envoy/service/metrics/v2/metrics_service.proto
+0
-6
未找到文件。
apm-dist-es7/pom.xml
浏览文件 @
665a07cb
...
...
@@ -106,13 +106,13 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<copy
file=
"${project.build.directory}/apache-skywalking-apm-bin-es7.tar.gz"
tofile=
"${project.basedir}/../dist/apache-skywalking-apm-bin-es7.tar.gz"
overwrite=
"true"
/>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
apm-dist-es7/src/main/assembly/binary-es7.xml
浏览文件 @
665a07cb
...
...
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>
${project.basedir}/../dist-material/bin
</directory>
<outputDirectory>
/
bin
</outputDirectory>
<outputDirectory>
bin
</outputDirectory>
<includes>
<include>
*.sh
</include>
<include>
*.bat
</include>
...
...
@@ -36,7 +36,7 @@
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material
</directory>
<outputDirectory>
/
config
</outputDirectory>
<outputDirectory>
config
</outputDirectory>
<includes>
<include>
log4j2.xml
</include>
<include>
alarm-settings.yml
</include>
...
...
@@ -44,7 +44,7 @@
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material
</directory>
<outputDirectory
>
/
</outputDirectory
>
<outputDirectory
/
>
<includes>
<include>
config-examples/*
</include>
</includes>
...
...
@@ -68,49 +68,39 @@
<include>
lal/*
</include>
<include>
log-mal-rules/*
</include>
</includes>
<outputDirectory>
/
config
</outputDirectory>
<outputDirectory>
config
</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.basedir}/../oap-server/server-starter-es7/target/skywalking-oap-assembly/skywalking-oap/libs
</directory>
<outputDirectory>
/
oap-libs
</outputDirectory>
<outputDirectory>
oap-libs
</outputDirectory>
</fileSet>
<!-- Agent repackage into the dist -->
<fileSet>
<directory>
${project.basedir}/../skywalking-agent
</directory>
<outputDirectory>
/
agent
</outputDirectory>
<outputDirectory>
agent
</outputDirectory>
</fileSet>
<!-- Profile exporter tools -->
<fileSet>
<directory>
${project.basedir}/../tools/profile-exporter
</directory>
<outputDirectory>
/tools/profile-exporter
</outputDirectory>
</fileSet>
<!-- Release docs and licenses -->
<fileSet>
<directory>
${project.basedir}/../
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
DISCLAIMER
</include>
<include>
CHANGES
</include>
</includes>
<outputDirectory>
tools/profile-exporter
</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material/release-docs
</directory>
<outputDirectory
>
/
</outputDirectory
>
<outputDirectory
/
>
</fileSet>
</fileSets>
<files>
<file>
<source>
${project.basedir}/../apm-webapp/target/skywalking-webapp.jar
</source>
<outputDirectory>
/
webapp
</outputDirectory>
<outputDirectory>
webapp
</outputDirectory>
<fileMode>
0644
</fileMode>
</file>
<file>
<source>
${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml
</source>
<outputDirectory>
/
webapp
</outputDirectory>
<outputDirectory>
webapp
</outputDirectory>
<fileMode>
0644
</fileMode>
</file>
</files>
...
...
apm-dist/pom.xml
浏览文件 @
665a07cb
...
...
@@ -106,13 +106,13 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<copy
file=
"${project.build.directory}/apache-skywalking-apm-bin.tar.gz"
tofile=
"${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz"
overwrite=
"true"
/>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
apm-dist/src/main/assembly/binary.xml
浏览文件 @
665a07cb
...
...
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>
${project.basedir}/../dist-material/bin
</directory>
<outputDirectory>
/
bin
</outputDirectory>
<outputDirectory>
bin
</outputDirectory>
<includes>
<include>
*.sh
</include>
<include>
*.bat
</include>
...
...
@@ -36,7 +36,7 @@
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material
</directory>
<outputDirectory>
/
config
</outputDirectory>
<outputDirectory>
config
</outputDirectory>
<includes>
<include>
log4j2.xml
</include>
<include>
alarm-settings.yml
</include>
...
...
@@ -44,7 +44,7 @@
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material
</directory>
<outputDirectory
>
/
</outputDirectory
>
<outputDirectory
/
>
<includes>
<include>
config-examples/*
</include>
</includes>
...
...
@@ -68,49 +68,39 @@
<include>
lal/*
</include>
<include>
log-mal-rules/*
</include>
</includes>
<outputDirectory>
/
config
</outputDirectory>
<outputDirectory>
config
</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/libs
</directory>
<outputDirectory>
/
oap-libs
</outputDirectory>
<outputDirectory>
oap-libs
</outputDirectory>
</fileSet>
<!-- Agent repackage into the dist -->
<fileSet>
<directory>
${project.basedir}/../skywalking-agent
</directory>
<outputDirectory>
/
agent
</outputDirectory>
<outputDirectory>
agent
</outputDirectory>
</fileSet>
<!-- Profile exporter tools -->
<fileSet>
<directory>
${project.basedir}/../tools/profile-exporter
</directory>
<outputDirectory>
/tools/profile-exporter
</outputDirectory>
</fileSet>
<!-- Release docs and licenses -->
<fileSet>
<directory>
${project.basedir}/../
</directory>
<outputDirectory>
/
</outputDirectory>
<includes>
<include>
DISCLAIMER
</include>
<include>
CHANGES
</include>
</includes>
<outputDirectory>
tools/profile-exporter
</outputDirectory>
</fileSet>
<fileSet>
<directory>
${project.basedir}/../dist-material/release-docs
</directory>
<outputDirectory
>
/
</outputDirectory
>
<outputDirectory
/
>
</fileSet>
</fileSets>
<files>
<file>
<source>
${project.basedir}/../apm-webapp/target/skywalking-webapp.jar
</source>
<outputDirectory>
/
webapp
</outputDirectory>
<outputDirectory>
webapp
</outputDirectory>
<fileMode>
0644
</fileMode>
</file>
<file>
<source>
${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml
</source>
<outputDirectory>
/
webapp
</outputDirectory>
<outputDirectory>
webapp
</outputDirectory>
<fileMode>
0644
</fileMode>
</file>
</files>
...
...
apm-sniffer/apm-agent-core/pom.xml
浏览文件 @
665a07cb
...
...
@@ -239,9 +239,9 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<delete
dir=
"${project.basedir}/../../packages"
/>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
<execution>
...
...
apm-sniffer/apm-agent/pom.xml
浏览文件 @
665a07cb
...
...
@@ -116,9 +116,9 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<delete
dir=
"${project.basedir}/../../skywalking-agent"
/>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
<execution>
...
...
@@ -128,13 +128,13 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<mkdir
dir=
"${project.basedir}/../../skywalking-agent"
/>
<copy
file=
"${project.build.directory}/skywalking-agent.jar"
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}/../../skywalking-agent/config"
forceoverwrite=
"true"
/>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
apm-sniffer/apm-sdk-plugin/pom.xml
浏览文件 @
665a07cb
...
...
@@ -189,7 +189,7 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<taskdef
resource=
"net/sf/antcontrib/antcontrib.properties"
classpathref=
"maven.runtime.classpath"
/>
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
...
...
@@ -199,7 +199,7 @@
</then>
</if>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
apm-sniffer/apm-toolkit-activation/pom.xml
浏览文件 @
665a07cb
...
...
@@ -115,7 +115,7 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<taskdef
resource=
"net/sf/antcontrib/antcontrib.properties"
classpathref=
"maven.runtime.classpath"
/>
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
...
...
@@ -125,7 +125,7 @@
</then>
</if>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
apm-sniffer/bootstrap-plugins/pom.xml
浏览文件 @
665a07cb
...
...
@@ -101,7 +101,7 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<taskdef
resource=
"net/sf/antcontrib/antcontrib.properties"
classpathref=
"maven.runtime.classpath"
/>
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
...
...
@@ -110,7 +110,7 @@
<copy
file=
"${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile=
"${bootstrap.plugin.dest.dir}/${project.artifactId}-${project.version}.jar"
overwrite=
"true"
/>
</then>
</if>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
@@ -136,4 +136,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
apm-sniffer/optional-plugins/pom.xml
浏览文件 @
665a07cb
...
...
@@ -106,7 +106,7 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<taskdef
resource=
"net/sf/antcontrib/antcontrib.properties"
classpathref=
"maven.runtime.classpath"
/>
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
...
...
@@ -115,7 +115,7 @@
<copy
file=
"${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile=
"${optional.plugin.dest.dir}/${project.artifactId}-${project.version}.jar"
overwrite=
"true"
/>
</then>
</if>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
@@ -141,4 +141,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
浏览文件 @
665a07cb
...
...
@@ -118,7 +118,7 @@
<goal>
run
</goal>
</goals>
<configuration>
<ta
sks
>
<ta
rget
>
<taskdef
resource=
"net/sf/antcontrib/antcontrib.properties"
classpathref=
"maven.runtime.classpath"
/>
<if>
<equals
arg1=
"${project.packaging}"
arg2=
"jar"
/>
...
...
@@ -127,7 +127,7 @@
<copy
file=
"${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar"
tofile=
"${optional.reporter.plugins.dest.dir}/${project.artifactId}-${project.version}.jar"
overwrite=
"true"
/>
</then>
</if>
</ta
sks
>
</ta
rget
>
</configuration>
</execution>
</executions>
...
...
@@ -153,4 +153,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
oap-server/server-library/library-util/pom.xml
浏览文件 @
665a07cb
...
...
@@ -37,11 +37,6 @@
<groupId>
joda-time
</groupId>
<artifactId>
joda-time
</artifactId>
</dependency>
<dependency>
<groupId>
org.yaml
</groupId>
<artifactId>
snakeyaml
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.github.stefanbirkner
</groupId>
<artifactId>
system-rules
</artifactId>
...
...
oap-server/server-receiver-plugin/receiver-proto/src/main/proto/envoy/service/metrics/v2/metrics_service.proto
浏览文件 @
665a07cb
...
...
@@ -10,12 +10,6 @@ option java_generic_services = true;
import
"envoy/service/metrics/v3/metrics_service.proto"
;
// This line is different from the definition in https://github.com/envoyproxy/data-plane-api to let
// the dependency structure clearer.
import
"prometheus/client_model/metrics.proto"
;
import
"validate/validate.proto"
;
// Service for streaming metrics to server that consumes the metrics data. It uses Prometheus metric
// data model as a standard to represent metrics information.
service
MetricsService
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录