Skip to content

Commit

Permalink
Remove Common Clause License (#3263)
Browse files Browse the repository at this point in the history
* Remove Common Clause 1.0 License

* Again

* Cleanup CC
  • Loading branch information
yixinglu authored Nov 3, 2021
1 parent b4af65a commit cb0e528
Show file tree
Hide file tree
Showing 1,776 changed files with 1,775 additions and 3,566 deletions.
3 changes: 1 addition & 2 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.
#
# This is the output of clang-format-10.0.0 --style=google --dump-config,
# except for changes mentioned below.
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ assignees: ''
<!-- Please describe the enhancement what you want in this section -->

## Related work
<!-- In this section you can add other related tasks to help assigner to complete the task more easily -->
<!-- In this section you can add other related tasks to help assigner to complete the task more easily -->
3 changes: 1 addition & 2 deletions .linters/cpp/checkKeyword.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# Copyright (c) 2019 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

import os
import re
Expand Down
3 changes: 1 addition & 2 deletions .linters/cpp/hooks/pre-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# Copyright (c) 2018 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

CPPLINT=`dirname $0`/../../.linters/cpp/cpplint.py
CHECKKEYWORD=`dirname $0`/../../.linters/cpp/checkKeyword.py
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2018 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

# The build can be controlled by defining following variables on the
# <cmake> command line
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Currently we use clang-format to format the code. We recommend you to configure
- Emacs
https://github.com/llvm-mirror/clang/blob/master/tools/clang-format/clang-format.el
- VS Code
https://code.visualstudio.com/docs/cpp/cpp-ide#_code-formatting
https://code.visualstudio.com/docs/cpp/cpp-ide#_code-formatting
14 changes: 0 additions & 14 deletions LICENSES/CC-1.0.txt

This file was deleted.

2 changes: 0 additions & 2 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ Nebula Graph 1.x 后续不再进行功能的更新,请升级到2.0版本中。

**Nebula Graph** 使用 [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) 许可证,您可以免费下载,修改以及部署源代码。您还可以将 **Nebula Graph** 作为后端服务部署以支持您的 SaaS 部署。

为防止云供应商从项目赢利而不回馈,**Nebula Graph** 在项目中添加了 [Commons Clause 1.0](https://commonsclause.com/) 条款。如上所述,**Nebula Graph** 是一个完全开源的项目,欢迎您就许可模式提出建议,帮助 **Nebula Graph** 社区更好地发展。

## 联系方式

* 访问[官网](http://nebula-graph.com.cn/)
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ Contributions are warmly welcomed and greatly appreciated. And here are a few wa

**Nebula Graph** is under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) license, so you can freely download, modify, and deploy the source code to meet your needs. You can also freely deploy **Nebula Graph** as a back-end service to support your SaaS deployment.

In order to prevent cloud providers monetizing from the project without contributing back, we added [Commons Clause 1.0](https://commonsclause.com/) to the project. As mentioned above, we fully commit to the open source community. We would love to hear your thoughts on the licensing model and are willing to make it more suitable for the community.

## Contact

* [Slack channel](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g)
Expand Down
5 changes: 2 additions & 3 deletions cmake/CPackage.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.
#


Expand All @@ -10,7 +9,7 @@ macro(package to_one name home_page scripts_dir)
set(CPACK_PACKAGE_DESCRIPTION ${name})
set(CPACK_PACKAGE_CONTACT ${name})
set(CPACK_PACKAGE_VERSION ${NEBULA_BUILD_VERSION})
set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0 + Common Clause 1.0")
set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
set(CPACK_PACKAGE_NAME ${name})
# set(CPACK_SET_DESTDIR TRUE)
set(CPACK_PACKAGE_RELOCATABLE ON)
Expand Down
3 changes: 1 addition & 2 deletions cmake/FetchModule.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.
#

find_package(Git)
Expand Down
3 changes: 1 addition & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

# For more configuration details:
# https://docs.codecov.io/docs/codecov-yaml
Expand Down
3 changes: 1 addition & 2 deletions conf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

# These configuration files are for reference to generate your own customized ones.
# Thus, they are installed as read-only, even for the owner.
Expand Down
3 changes: 1 addition & 2 deletions resources/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

install(
FILES
Expand Down
3 changes: 1 addition & 2 deletions scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2021 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

install(
FILES
Expand Down
3 changes: 1 addition & 2 deletions scripts/services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# Copyright (c) 2019 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

SCRIPT_PATH=$(cd "$(dirname "$0")";pwd)

Expand Down
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

nebula_add_subdirectory(clients)
nebula_add_subdirectory(codec)
Expand Down
3 changes: 1 addition & 2 deletions src/clients/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

nebula_add_subdirectory(meta)
nebula_add_subdirectory(storage)
3 changes: 1 addition & 2 deletions src/clients/meta/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

nebula_add_library(
meta_client_obj OBJECT
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/FileBasedClusterIdMan.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2019 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/meta/FileBasedClusterIdMan.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/FileBasedClusterIdMan.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2019 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_META_FILEBASEDCLUSTERIDMAN_H_
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/MetaClient.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/meta/MetaClient.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/MetaClient.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_META_METACLIENT_H_
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

nebula_add_test(
NAME file_based_cluster_id_man_test
Expand Down
3 changes: 1 addition & 2 deletions src/clients/meta/test/FileBasedClusterIdManTest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2019 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include <gtest/gtest.h>
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Copyright (c) 2020 vesoft inc. All rights reserved.
#
# This source code is licensed under Apache 2.0 License,
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
# This source code is licensed under Apache 2.0 License.

nebula_add_library(
graph_storage_client_obj OBJECT
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/GeneralStorageClient.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/storage/GeneralStorageClient.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/GeneralStorageClient.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_STORAGE_GENERALSTORAGECLIENT_H_
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/GraphStorageClient.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/storage/GraphStorageClient.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/GraphStorageClient.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_STORAGE_GRAPHSTORAGECLIENT_H_
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/InternalStorageClient.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/storage/InternalStorageClient.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/InternalStorageClient.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_STORAGE_INTERNALSTORAGEClient_H_
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/StorageClientBase-inl.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#pragma once
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/StorageClientBase.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "clients/storage/StorageClientBase.h"
Expand Down
3 changes: 1 addition & 2 deletions src/clients/storage/StorageClientBase.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CLIENTS_STORAGE_STORAGECLIENTBASE_H_
Expand Down
3 changes: 1 addition & 2 deletions src/codec/Common.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CODEC_COMMON_H_
Expand Down
3 changes: 1 addition & 2 deletions src/codec/NebulaCodecImpl.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "codec/NebulaCodecImpl.h"
Expand Down
3 changes: 1 addition & 2 deletions src/codec/NebulaCodecImpl.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef NEBULA_GRAPH_NEBULACODECIMPL_H
Expand Down
3 changes: 1 addition & 2 deletions src/codec/RowReader.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "codec/RowReader.h"
Expand Down
3 changes: 1 addition & 2 deletions src/codec/RowReader.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CODEC_ROWREADER_H_
Expand Down
3 changes: 1 addition & 2 deletions src/codec/RowReaderV1.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2020 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#include "codec/RowReaderV1.h"
Expand Down
3 changes: 1 addition & 2 deletions src/codec/RowReaderV1.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* Copyright (c) 2018 vesoft inc. All rights reserved.
*
* This source code is licensed under Apache 2.0 License,
* attached with Common Clause Condition 1.0, found in the LICENSES directory.
* This source code is licensed under Apache 2.0 License.
*/

#ifndef CODEC_ROWREADERV1_H_
Expand Down
Loading

0 comments on commit cb0e528

Please sign in to comment.