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 2020/11/01 01:59:54 UTC
[skywalking-satellite] 01/02: Fix copy/paste issue license file.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch fix-license
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
commit 612e63ffe792b8be255f6fe11039483f6bacf111
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Oct 31 19:54:36 2020 +0800
Fix copy/paste issue license file.
---
LICENSE | 12 +-----------
LICENSE => dist/LICENSE | 12 +-----------
dist/NOTICE | 5 +++++
3 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/LICENSE b/LICENSE
index b3f1f51..ba12634 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,15 +215,7 @@ 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.
- 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
- proto files from envoyproxy/data-plane-api: https://github.com/envoyproxy/data-plane-api Apache 2.0
- 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
- mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
- svg files from skywalking-ui/src/assets/icons: https://github.com/google/material-design-icons Apache 2.0
-
+
========================================================================
BSD licenses
========================================================================
@@ -231,6 +223,4 @@ BSD licenses
The following components are provided under a BSD license. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- proto files from gogo: https://github.com/gogo/protobuf BSD-2
- proto files from grpc-gateway, https://github.com/grpc-ecosystem/grpc-gateway/tree/master/protoc-gen-swagger/options BSD-3
diff --git a/LICENSE b/dist/LICENSE
similarity index 93%
copy from LICENSE
copy to dist/LICENSE
index b3f1f51..ba12634 100644
--- a/LICENSE
+++ b/dist/LICENSE
@@ -215,15 +215,7 @@ 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.
- 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
- proto files from envoyproxy/data-plane-api: https://github.com/envoyproxy/data-plane-api Apache 2.0
- 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
- mvnw files from https://github.com/takari/maven-wrapper Apache 2.0
- svg files from skywalking-ui/src/assets/icons: https://github.com/google/material-design-icons Apache 2.0
-
+
========================================================================
BSD licenses
========================================================================
@@ -231,6 +223,4 @@ BSD licenses
The following components are provided under a BSD license. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- proto files from gogo: https://github.com/gogo/protobuf BSD-2
- proto files from grpc-gateway, https://github.com/grpc-ecosystem/grpc-gateway/tree/master/protoc-gen-swagger/options BSD-3
diff --git a/dist/NOTICE b/dist/NOTICE
new file mode 100644
index 0000000..e646f51
--- /dev/null
+++ b/dist/NOTICE
@@ -0,0 +1,5 @@
+Apache SkyWalking
+Copyright 2017-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).