You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/04 12:49:15 UTC

[incubator-skywalking] 01/01: Add LICENSE full text into source license and remove NOTICE

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch fix-v6-LICENSE
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git

commit 6d597f0c419f4e0e4eefaaeea920b5c1cbc9a92c
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 4 20:49:03 2018 +0800

    Add LICENSE full text into source license and remove NOTICE
---
 LICENSE                            | 41 ++++++++++++++++++++++++++++++--------
 NOTICE                             | 23 ---------------------
 licenses/LICENSE-antd.txt          | 22 ++++++++++++++++++++
 licenses/LICENSE-gogo-protobuf.txt | 35 ++++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/LICENSE b/LICENSE
index a434cde..3387170 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,15 +200,40 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-   =======================================================================
-   Apache SkyWalking Subcomponents:
+=======================================================================
+Apache SkyWalking Subcomponents:
 
-   The Apache SkyWalking project contains subcomponents with separate copyright
-   notices and license terms. Your use of the source code for the these
-   subcomponents is subject to the terms and conditions of the following
-   licenses.
+The Apache SkyWalking project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+========================================================================
+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.
 
-   iconfont(from antd): https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont   MIT
    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 gogo/protobuf: https://github.com/gogo/protobuf  BSD-3
\ No newline at end of file
+
+
+========================================================================
+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 protobuf: https://github.com/gogo/protobuf  BSD-3
+
+
+========================================================================
+MIT licenses
+========================================================================
+
+The following components are provided under the MIT License. See project link for details.
+The text of each license is also included at licenses/LICENSE-[project].txt.
+
+   iconfont(from antd): https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont   MIT
diff --git a/NOTICE b/NOTICE
index 7be04fc..a1b74dd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,26 +3,3 @@ Copyright 2017-2018 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product bundles icons/fonts in skywalking-ui/public/font/iconfont folder
-from the ant-design project,
-https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
-Licensed under the MIT license, confirmed by ant-design team member.
-https://github.com/ant-design/ant-design/issues/10243
-
-This product bundles the following proto files
-1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/istio-metric.proto
-2. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/type.proto
-3. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/policy/v1beta1/value_type.proto
-4. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/extensions.proto
-5. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/mixer/adapter/model/v1beta1/report.proto
-from the istio projects,
-https://github.com/istio/istio
-https://github.com/istio/api
-Licensed under the Apache 2.0 license.
-
-This product bundles the following proto file
-1. oap-server/server-receiver-plugin/istio-telemetry-receiver-provider/src/main/proto/gogoproto/gogo.proto
-from the gogo/protobuf project,
-https://github.com/gogo/protobuf
-Licensed under the BSD-3-Clause license.
\ No newline at end of file
diff --git a/licenses/LICENSE-antd.txt b/licenses/LICENSE-antd.txt
new file mode 100644
index 0000000..12189b6
--- /dev/null
+++ b/licenses/LICENSE-antd.txt
@@ -0,0 +1,22 @@
+MIT LICENSE
+
+Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/LICENSE-gogo-protobuf.txt b/licenses/LICENSE-gogo-protobuf.txt
new file mode 100644
index 0000000..f57de90
--- /dev/null
+++ b/licenses/LICENSE-gogo-protobuf.txt
@@ -0,0 +1,35 @@
+Copyright (c) 2013, The GoGo Authors. All rights reserved.
+
+Protocol Buffers for Go with Gadgets
+
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+