Skip to content

Commit

Permalink
Switch Dgraph back to Apache 2.0 (#2652)
Browse files Browse the repository at this point in the history
While the promise of Commons Clause is a great one, i.e. restricting resale while allowing proprietary usage, its subjective implementation generates a lot of friction and confusion for the open source community.

Being an open source developer at heart, I'm glad to be bringing Dgraph back to Apache 2.0 license. It is something that we started off with, but then got lost into the AGPL woods. At the end of the day, Apache license is the gold standard of licenses, and something open source users (i.e. the world) feel very comfortable with. The vision for Dgraph is to bring graph databases mainstream, allowing them to be the primary databases holding the source of truth, and that's only possible if it can be adopted by any company, big or small, without any concerns.

**Apache license lets achieve that vision.**

We will be adding proprietary features later on under an enterprise license, but as long as I'm in charge, we're not moving the core away from Apache 2.0 license. This is it.
  • Loading branch information
manishrjain committed Oct 11, 2018
1 parent 88ea8ff commit 3d0b2cd
Show file tree
Hide file tree
Showing 204 changed files with 2,442 additions and 622 deletions.
28 changes: 3 additions & 25 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Copyright 2016-2018 Dgraph Labs, Inc.

Licensed under the Apache License, Version 2.0 (the "License") and the Commons
Clause Restriction; you may not use this file except in compliance with the
License. You may obtain a copy of the License at
Source code in this repository is licensed under the Apache Public License 2.0
(APL). A copy of APL is present in this repository, and is also available online
at

http://www.apache.org/licenses/LICENSE-2.0

Expand All @@ -13,28 +13,6 @@ 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.

### Commons Clause Restriction

The Software is provided to you by the Licensor under the License, as defined
below, subject to the following condition. Without limiting other conditions in
the License, the grant of rights under the License will not include, and the
License does not grant to you, the right to Sell the Software. For purposes of
the foregoing, “Sell” means practicing any or all of the rights granted to you
under the License to provide to third parties, for a fee or other consideration
(including without limitation fees for hosting or consulting/ support services
related to the Software), a product or service whose value derives, entirely or
substantially, from the functionality of the Software. Any license notice or
attribution required by the License must also include this Commons Cause License
Condition notice.

For purposes of the clause above, the “Licensor” is Dgraph Labs, Inc., the
“License” is the Apache License, Version 2.0, and the Software is the Dgraph
software provided with this notice.

You may obtain a copy of the clause at

https://commonsclause.com/

## Trademark

Dgraph is a registered trademark of Dgraph Labs, Inc.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ makes it easy to build applications with it.
| Full Text Search | Native support | Native support | Via External Indexing System |
| Regular Expressions | Native support | Native support | Via External Indexing System |
| Geo Search | Native support | External support only | Via External Indexing System |
| License | Apache 2.0 + Commons Clause | GPL v3 | Apache 2.0 |
| License | Apache 2.0 | GPL v3 | Apache 2.0 |

## Users
- **Dgraph official documentation is present at [docs.dgraph.io](https://docs.dgraph.io).**
Expand All @@ -108,7 +108,7 @@ makes it easy to build applications with it.
## Unofficial Client Libraries
The Dgraph team maintain a number of [officially supported client libraries](https://docs.dgraph.io/clients/). The following libraries are contributed by the community.

**C# .NET**
**C# .NET**

* [https://github.com/AlexandreDaSilva/DgraphNet](https://github.com/AlexandreDaSilva/DgraphNet)
* [https://github.com/MichaelJCompton/Dgraph-dotnet](https://github.com/MichaelJCompton/Dgraph-dotnet)
Expand Down
15 changes: 12 additions & 3 deletions algo/doc.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

// Package algo contains algorithms such as merging, intersecting sorted lists.
Expand Down
15 changes: 12 additions & 3 deletions algo/heap.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package algo
Expand Down
15 changes: 12 additions & 3 deletions algo/heap_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package algo
Expand Down
15 changes: 12 additions & 3 deletions algo/uidlist.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package algo
Expand Down
15 changes: 12 additions & 3 deletions algo/uidlist_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package algo
Expand Down
15 changes: 12 additions & 3 deletions conn/node.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2017-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package conn
Expand Down
16 changes: 16 additions & 0 deletions conn/node_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2018 Dgraph Labs, Inc. and Contributors
*
* 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
*
* http://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.
*/

package conn

import (
Expand Down
15 changes: 12 additions & 3 deletions conn/pool.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2016-2018 Dgraph Labs, Inc.
* Copyright 2016-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package conn
Expand Down
15 changes: 12 additions & 3 deletions conn/raft_server.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package conn
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/acctupsert/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2017-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package main
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/bank/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2017-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package main
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/bigdata/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2018 Dgraph Labs, Inc.
* Copyright 2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package main
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/increment/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2018 Dgraph Labs, Inc.
* Copyright 2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

// This binary would retrieve a value for UID=0x01, and increment it by 1. If
Expand Down
16 changes: 16 additions & 0 deletions contrib/integration/increment/main_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2018 Dgraph Labs, Inc. and Contributors
*
* 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
*
* http://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.
*/

package main

import (
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/mutates/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2017-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package main
Expand Down
15 changes: 12 additions & 3 deletions contrib/integration/share/share_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/*
* Copyright 2017-2018 Dgraph Labs, Inc.
* Copyright 2017-2018 Dgraph Labs, Inc. and Contributors
*
* This file is available under the Apache License, Version 2.0,
* with the Commons Clause restriction.
* 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
*
* http://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.
*/

package testing
Expand Down
Loading

0 comments on commit 3d0b2cd

Please sign in to comment.