You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/10/31 12:08:16 UTC
[incubator-skywalking] branch fix-concurrency updated: Update
license. Fix package with dirty agent plugin jar files.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix-concurrency
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/fix-concurrency by this push:
new ffb322b Update license. Fix package with dirty agent plugin jar files.
ffb322b is described below
commit ffb322bf24ffecc3a816824963d3d2160609c9dd
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Oct 31 20:08:02 2018 +0800
Update license. Fix package with dirty agent plugin jar files.
---
apm-dist/release-docs/LICENSE | 8 ++++----
apm-sniffer/apm-agent/pom.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index c7c4cf5..9dc3f53 100644
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -225,15 +225,15 @@ Apache 2.0 licenses
The following components are provided under the Apache License. See project link for details.
The text of each license is the standard Apache 2.0 license.
- raphw (byte-buddy) 1.7.9: http://bytebuddy.net/ , Apache 2.0
- Google: grpc 1.8.0: https://grpc.io/ , Apache 2.0
- Google: gprc-java 1.8.0: https://github.com/grpc/grpc-java, Apache 2.0
+ raphw (byte-buddy) 1.9.2: http://bytebuddy.net/ , Apache 2.0
+ Google: grpc 1.10.0: https://grpc.io/ , Apache 2.0
+ Google: gprc-java 1.10.0: https://github.com/grpc/grpc-java, Apache 2.0
Google: guava 19.0: https://github.com/google/guava , Apache 2.0
Google: gson 2.8.1: https://github.com/google/gson , Apache 2.0
Google: opencensus-java 0.8.0: https://github.com/census-instrumentation/opencensus-java , Apache 2.0
Google: proto-google-common-protos 0.1.9: https://github.com/googleapis/googleapis , Apache 2.0
Google: jsr305 3.0.0: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0
- Elasticsearch BV (Elasticsearch) 5.5.0: https://www.elastic.co/products/elasticsearch , Apache 2.0
+ Elasticsearch BV (Elasticsearch) 6.3.2: https://www.elastic.co/products/elasticsearch , Apache 2.0
lang-mustache-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/lang-mustache , Apache 2.0
parent-join-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/parent-join , Apache 2.0
reindex-client 5.5.0: https://github.com/elastic/elasticsearch/tree/master/modules/reindex , Apache 2.0
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index e92d933..9094e3e 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -103,6 +103,7 @@
</goals>
<configuration>
<tasks>
+ <delete 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" />
<mkdir dir="${project.basedir}/../../skywalking-agent/config" />