Skip to content

S
SkyWalking

apache / SkyWalking
上一次同步 1 年多

通知 302
Star 21345
Fork 6091
S
SkyWalking

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 665a07cb 编写于 作者: Z Zhenxu Ke 提交者： GitHub
浏览文件
操作

Clean up some warnings in maven build (#6426)

上级 96f1c121
隐藏空白更改
内联 并排
Showing with 45 addition and 76 deletion
apm-dist-es7/pom.xml
浏览文件 @ 665a07cb
...@@ -106,13 +106,13 @@ ...@@ -106,13 +106,13 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<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" /> <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" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
apm-dist-es7/src/main/assembly/binary-es7.xml
浏览文件 @ 665a07cb
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material/bin</directory> <directory>${project.basedir}/../dist-material/bin</directory>
<outputDirectory>/bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>*.sh</include> <include>*.sh</include>
<include>*.bat</include> <include>*.bat</include>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material</directory> <directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/config</outputDirectory> <outputDirectory>config</outputDirectory>
<includes> <includes>
<include>log4j2.xml</include> <include>log4j2.xml</include>
<include>alarm-settings.yml</include> <include>alarm-settings.yml</include>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material</directory> <directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>config-examples/*</include> <include>config-examples/*</include>
</includes> </includes>
...@@ -68,49 +68,39 @@ ...@@ -68,49 +68,39 @@
<include>lal/*</include> <include>lal/*</include>
<include>log-mal-rules/*</include> <include>log-mal-rules/*</include>
</includes> </includes>
<outputDirectory>/config</outputDirectory> <outputDirectory>config</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../oap-server/server-starter-es7/target/skywalking-oap-assembly/skywalking-oap/libs</directory> <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> </fileSet>
<!-- Agent repackage into the dist --> <!-- Agent repackage into the dist -->
<fileSet> <fileSet>
<directory>${project.basedir}/../skywalking-agent</directory> <directory>${project.basedir}/../skywalking-agent</directory>
<outputDirectory>/agent</outputDirectory> <outputDirectory>agent</outputDirectory>
</fileSet> </fileSet>
<!-- Profile exporter tools --> <!-- Profile exporter tools -->
<fileSet> <fileSet>
<directory>${project.basedir}/../tools/profile-exporter</directory> <directory>${project.basedir}/../tools/profile-exporter</directory>
<outputDirectory>/tools/profile-exporter</outputDirectory> <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>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material/release-docs</directory> <directory>${project.basedir}/../dist-material/release-docs</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
</fileSet> </fileSet>
</fileSets> </fileSets>
<files> <files>
<file> <file>
<source>${project.basedir}/../apm-webapp/target/skywalking-webapp.jar</source> <source>${project.basedir}/../apm-webapp/target/skywalking-webapp.jar</source>
<outputDirectory>/webapp</outputDirectory> <outputDirectory>webapp</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</file> </file>
<file> <file>
<source>${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml</source> <source>${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml</source>
<outputDirectory>/webapp</outputDirectory> <outputDirectory>webapp</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</file> </file>
</files> </files>
......
apm-dist/pom.xml
浏览文件 @ 665a07cb
...@@ -106,13 +106,13 @@ ...@@ -106,13 +106,13 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="${project.build.directory}/apache-skywalking-apm-bin.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz" overwrite="true" /> <copy file="${project.build.directory}/apache-skywalking-apm-bin.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-bin.tar.gz" overwrite="true" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
apm-dist/src/main/assembly/binary.xml
浏览文件 @ 665a07cb
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material/bin</directory> <directory>${project.basedir}/../dist-material/bin</directory>
<outputDirectory>/bin</outputDirectory> <outputDirectory>bin</outputDirectory>
<includes> <includes>
<include>*.sh</include> <include>*.sh</include>
<include>*.bat</include> <include>*.bat</include>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material</directory> <directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/config</outputDirectory> <outputDirectory>config</outputDirectory>
<includes> <includes>
<include>log4j2.xml</include> <include>log4j2.xml</include>
<include>alarm-settings.yml</include> <include>alarm-settings.yml</include>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material</directory> <directory>${project.basedir}/../dist-material</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
<includes> <includes>
<include>config-examples/*</include> <include>config-examples/*</include>
</includes> </includes>
...@@ -68,49 +68,39 @@ ...@@ -68,49 +68,39 @@
<include>lal/*</include> <include>lal/*</include>
<include>log-mal-rules/*</include> <include>log-mal-rules/*</include>
</includes> </includes>
<outputDirectory>/config</outputDirectory> <outputDirectory>config</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/libs</directory> <directory>${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/libs</directory>
<outputDirectory>/oap-libs</outputDirectory> <outputDirectory>oap-libs</outputDirectory>
</fileSet> </fileSet>
<!-- Agent repackage into the dist --> <!-- Agent repackage into the dist -->
<fileSet> <fileSet>
<directory>${project.basedir}/../skywalking-agent</directory> <directory>${project.basedir}/../skywalking-agent</directory>
<outputDirectory>/agent</outputDirectory> <outputDirectory>agent</outputDirectory>
</fileSet> </fileSet>
<!-- Profile exporter tools --> <!-- Profile exporter tools -->
<fileSet> <fileSet>
<directory>${project.basedir}/../tools/profile-exporter</directory> <directory>${project.basedir}/../tools/profile-exporter</directory>
<outputDirectory>/tools/profile-exporter</outputDirectory> <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>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/../dist-material/release-docs</directory> <directory>${project.basedir}/../dist-material/release-docs</directory>
<outputDirectory>/</outputDirectory> <outputDirectory/>
</fileSet> </fileSet>
</fileSets> </fileSets>
<files> <files>
<file> <file>
<source>${project.basedir}/../apm-webapp/target/skywalking-webapp.jar</source> <source>${project.basedir}/../apm-webapp/target/skywalking-webapp.jar</source>
<outputDirectory>/webapp</outputDirectory> <outputDirectory>webapp</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</file> </file>
<file> <file>
<source>${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml</source> <source>${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml</source>
<outputDirectory>/webapp</outputDirectory> <outputDirectory>webapp</outputDirectory>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>
</file> </file>
</files> </files>
......
apm-sniffer/apm-agent-core/pom.xml
浏览文件 @ 665a07cb
...@@ -239,9 +239,9 @@ ...@@ -239,9 +239,9 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<delete dir="${project.basedir}/../../packages" /> <delete dir="${project.basedir}/../../packages" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
......
apm-sniffer/apm-agent/pom.xml
浏览文件 @ 665a07cb
...@@ -116,9 +116,9 @@ ...@@ -116,9 +116,9 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<delete dir="${project.basedir}/../../skywalking-agent" /> <delete dir="${project.basedir}/../../skywalking-agent" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
...@@ -128,13 +128,13 @@ ...@@ -128,13 +128,13 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<mkdir dir="${project.basedir}/../../skywalking-agent" /> <mkdir dir="${project.basedir}/../../skywalking-agent" />
<copy file="${project.build.directory}/skywalking-agent.jar" tofile="${project.basedir}/../../skywalking-agent/skywalking-agent.jar" overwrite="true" /> <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/config" />
<mkdir dir="${project.basedir}/../../skywalking-agent/logs" /> <mkdir dir="${project.basedir}/../../skywalking-agent/logs" />
<copydir src="${project.basedir}/../config" dest="${project.basedir}/../../skywalking-agent/config" forceoverwrite="true" /> <copydir src="${project.basedir}/../config" dest="${project.basedir}/../../skywalking-agent/config" forceoverwrite="true" />
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
apm-sniffer/apm-sdk-plugin/pom.xml
浏览文件 @ 665a07cb
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" />
<if> <if>
<equals arg1="${project.packaging}" arg2="jar" /> <equals arg1="${project.packaging}" arg2="jar" />
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</then> </then>
</if> </if>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
apm-sniffer/apm-toolkit-activation/pom.xml
浏览文件 @ 665a07cb
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" />
<if> <if>
<equals arg1="${project.packaging}" arg2="jar" /> <equals arg1="${project.packaging}" arg2="jar" />
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</then> </then>
</if> </if>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
apm-sniffer/bootstrap-plugins/pom.xml
浏览文件 @ 665a07cb
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" />
<if> <if>
<equals arg1="${project.packaging}" arg2="jar" /> <equals arg1="${project.packaging}" arg2="jar" />
...@@ -110,7 +110,7 @@ ...@@ -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" /> <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${bootstrap.plugin.dest.dir}/${project.artifactId}-${project.version}.jar" overwrite="true" />
</then> </then>
</if> </if>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
...@@ -136,4 +136,4 @@ ...@@ -136,4 +136,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
apm-sniffer/optional-plugins/pom.xml
浏览文件 @ 665a07cb
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" />
<if> <if>
<equals arg1="${project.packaging}" arg2="jar" /> <equals arg1="${project.packaging}" arg2="jar" />
...@@ -115,7 +115,7 @@ ...@@ -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" /> <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar" tofile="${optional.plugin.dest.dir}/${project.artifactId}-${project.version}.jar" overwrite="true" />
</then> </then>
</if> </if>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
...@@ -141,4 +141,4 @@ ...@@ -141,4 +141,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/pom.xml
浏览文件 @ 665a07cb
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.runtime.classpath" />
<if> <if>
<equals arg1="${project.packaging}" arg2="jar" /> <equals arg1="${project.packaging}" arg2="jar" />
...@@ -127,7 +127,7 @@ ...@@ -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" /> <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> </then>
</if> </if>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
...@@ -153,4 +153,4 @@ ...@@ -153,4 +153,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
oap-server/server-library/library-util/pom.xml
浏览文件 @ 665a07cb
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
<groupId>joda-time</groupId> <groupId>joda-time</groupId>
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.github.stefanbirkner</groupId> <groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId> <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; ...@@ -10,12 +10,6 @@ option java_generic_services = true;
import "envoy/service/metrics/v3/metrics_service.proto"; 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 // Service for streaming metrics to server that consumes the metrics data. It uses Prometheus metric
// data model as a standard to represent metrics information. // data model as a standard to represent metrics information.
service MetricsService { service MetricsService {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或