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 2019/06/15 03:50:34 UTC
[skywalking] branch master updated: Add missing licenses and remove
duplicate plugin management (#2879)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new feb545f Add missing licenses and remove duplicate plugin management (#2879)
feb545f is described below
commit feb545f621f261b351d8d15d6a7517e847374c30
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sat Jun 15 11:50:29 2019 +0800
Add missing licenses and remove duplicate plugin management (#2879)
---
apm-dist/release-docs/LICENSE | 5 ++++-
apm-dist/release-docs/NOTICE | 25 ++++++++++++++++++++++++-
pom.xml | 5 +----
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index f8c1911..5b58eea 100644
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -250,6 +250,7 @@ The text of each license is the standard Apache 2.0 license.
Eclipse (Jetty) 3.3.6: https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0
SnakeYAML 1.18: http://www.snakeyaml.org , Apache 2.0
Joda-Time 2.9.9: http://www.joda.org/joda-time/ , Apache 2.0
+ Joda-Convert 1.2: http://www.joda.org/joda-convert/ , Apache 2.0
Spring Framework 4.3.14.RELEASE: https://github.com/spring-projects/spring-framework, Apache 2.0
Spring Boot 1.5.10: https://spring.io/, Apache 2.0
Spring Cloud Config 1.4.1: https://github.com/spring-cloud/spring-cloud-config, Apache-2.0
@@ -267,6 +268,7 @@ The text of each license is the standard Apache 2.0 license.
Apache: commons-collections 3.2.2: https://github.com/apache/commons-collections, Apache 2.0
Apache: commons-configuration 1.8: https://github.com/apache/commons-configuration, Apache 2.0
Apache: commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
+ Apache: commons-compress 1.18: https://github.com/apache/commons-compress, Apache 2.0
Apache: tomcat 8.5.27: https://github.com/apache/tomcat/tree/trunk, Apache 2.0
netty 5.5.0: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
annotations 13.0: http://www.jetbrains.org, Apache 2.0
@@ -302,7 +304,7 @@ The text of each license is the standard Apache 2.0 license.
HikariCP 3.1.0: https://github.com/brettwooldridge/HikariCP, Apache 2.0
zipkin 2.9.1: https://github.com/openzipkin/zipkin, Apache 2.0
sharding-jdbc-core 2.0.3: https://github.com/sharding-sphere/sharding-sphere, Apache 2.0
- kubernetes-client 2.0.0: https://github.com/kubernetes-client/java, Apache 2.0
+ kubernetes-client 4.0.0: https://github.com/kubernetes-client/java, Apache 2.0
proto files from istio/istio: https://github.com/istio/istio Apache 2.0
proto files from istio/api: https://github.com/istio/api Apache 2.0
consul-client 1.2.6: https://github.com/rickfast/consul-client, Apache 2.0
@@ -315,6 +317,7 @@ The text of each license is the standard Apache 2.0 license.
proto files from prometheus/client_model: https://github.com/prometheus/client_model Apache 2.0
proto files from lyft/protoc-gen-validate: https://github.com/lyft/protoc-gen-validate Apache 2.0
proto files from gogo/googleapis: https://github.com/gogo/googleapis Apache 2.0
+ sundrio 0.9.2: https://github.com/sundrio/sundrio Apache 2.0
========================================================================
MIT licenses
diff --git a/apm-dist/release-docs/NOTICE b/apm-dist/release-docs/NOTICE
index 60a4f45..3f18b86 100644
--- a/apm-dist/release-docs/NOTICE
+++ b/apm-dist/release-docs/NOTICE
@@ -216,6 +216,29 @@ Joda.org (http://www.joda.org/).
========================================================================
+Joda Convert
+Copyright 2010-present Stephen Colebourne
+
+This product includes software developed by
+Joda.org (https://www.joda.org/).
+
+
+Joda-Convert includes code from Google Guava, which is licensed as follows:
+
+Copyright (C) 2011 The Guava Authors
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+in compliance with the License. You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License
+is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing permissions and limitations under
+the License.
+
+========================================================================
+
netty NOTICE
========================================================================
@@ -868,4 +891,4 @@ Also, please refer to each LICENSE.<component>.txt file, which is located in
the 'license' directory of the distribution file, for the license terms of the
components that this product depends on.
-------
\ No newline at end of file
+------
diff --git a/pom.xml b/pom.xml
index e7c0aef..84bbade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,10 +302,6 @@
<version>${maven-failsafe-plugin.version}</version>
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
</plugin>
@@ -323,6 +319,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<excludes>
<exclude>IT*.class</exclude>