From 79828d7f888b7ffb80056e96c6a4998b57d17949 Mon Sep 17 00:00:00 2001 From: Lee Byron Date: Wed, 19 May 2021 17:08:02 -0700 Subject: [PATCH 1/3] Updated legal copy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #853 * Adds the disclaimer as required by §12 of v5 JDF docs * Updates the copyright section to be more accurate * Improves the history of governance * Adds a "License" subsection * Adds a readme to `/signed-agreements` Co-authored-by: Brian Warner --- signed-agreements/README.md | 12 ++++++++ spec/GraphQL.md | 59 ++++++++++++++++++++++--------------- 2 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 signed-agreements/README.md diff --git a/signed-agreements/README.md b/signed-agreements/README.md new file mode 100644 index 000000000..790d52f9f --- /dev/null +++ b/signed-agreements/README.md @@ -0,0 +1,12 @@ +# Legacy Signed Agreements + +The signed agreement found in this directory was contributed when this +specification was licensed under OWFa 1.0 on September 26, 2017 by Facebook. + +Since then the [GraphQL Foundation](https://graphql.org/foundation/) was +formed in 2019, at which point the GraphQL Specification Project became a +[Joint Development Foundation](https://www.jointdevelopment.org/) project. + +The charter and legal documents currently governing this specification and other +GraphQL projects can be found in the +[GraphQL Foundation repository](https://github.com/graphql/foundation). diff --git a/spec/GraphQL.md b/spec/GraphQL.md index 342a46a90..1544458ec 100644 --- a/spec/GraphQL.md +++ b/spec/GraphQL.md @@ -8,42 +8,55 @@ This is the specification for GraphQL, a query language and execution engine originally created at Facebook in 2012 for describing the capabilities and requirements of data models for client-server applications. The development of this open standard started in 2015. This specification was licensed under OWFa -1.0 in 2017. Copyright and trademark was transferred to the GraphQL Foundation -in 2019. +1.0 in 2017. The [GraphQL Foundation](https://graphql.org/foundation/) was +formed in 2019 as a neutral focal point for organizations who support the +GraphQL ecosystem, at which point the GraphQL Specification Project became a +[Joint Development Foundation](https://www.jointdevelopment.org/) project. If +your organization benefits from GraphQL, please consider becoming a member and +helping us to sustain the activities that support the health of our +neutral ecosystem. GraphQL has evolved and may continue to evolve in future editions of this specification. Previous editions of the GraphQL specification can be found at permalinks that match their [release tag](https://github.com/graphql/graphql-spec/releases). The latest working draft release can be found at [https://spec.graphql.org/draft](https://spec.graphql.org/draft). + **Copyright notice** Copyright © 2015-2018, Facebook, Inc. -Copyright © 2019-present, GraphQL Foundation - -As of September 26, 2017, the following persons or entities have made this -Specification available under the Open Web Foundation Final Specification -Agreement (OWFa 1.0), which is available at [openwebfoundation.org](http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0). - -* Facebook, Inc. - -You can review the signed copies of the Open Web Foundation Final Specification -Agreement Version 1.0 for this specification at [github.com/graphql/graphql-spec](https://github.com/graphql/graphql-spec/tree/main/signed-agreements), -which may also include additional parties to those listed above. +Copyright © 2019-present, GraphQL contributors -Your use of this Specification may be subject to other third party rights. -THIS SPECIFICATION IS PROVIDED “AS IS.” The contributors expressly disclaim any +THESE MATERIALS ARE PROVIDED “AS IS.” The parties expressly disclaim any warranties (express, implied, or otherwise), including implied warranties of merchantability, non-infringement, fitness for a particular purpose, or title, -related to the Specification. The entire risk as to implementing or otherwise -using the Specification is assumed by the Specification implementer and user. -IN NO EVENT WILL ANY PARTY BE LIABLE TO ANY OTHER PARTY FOR LOST PROFITS OR ANY -FORM OF INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER -FROM ANY CAUSES OF ACTION OF ANY KIND WITH RESPECT TO THIS SPECIFICATION OR ITS -GOVERNING AGREEMENT, WHETHER BASED ON BREACH OF CONTRACT, TORT (INCLUDING -NEGLIGENCE), OR OTHERWISE, AND WHETHER OR NOT THE OTHER PARTY HAS BEEN ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. +related to the materials. The entire risk as to implementing or otherwise using +the materials is assumed by the implementer and user. IN NO EVENT WILL THE +PARTIES BE LIABLE TO ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES +OF ACTION OF ANY KIND WITH RESPECT TO THIS DELIVERABLE OR ITS GOVERNING +AGREEMENT, WHETHER BASED ON BREACH OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR +OTHERWISE, AND WHETHER OR NOT THE OTHER MEMBER HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +**Licensing** + +The GraphQL Specification Project is made available by the +[Joint Development Foundation](https://www.jointdevelopment.org/). The current +[Working Group](https://github.com/graphql/graphql-wg) charter, which includes +the IP policy governing all working group deliverables (including +specifications, source code, and datasets) may be found at +https://technical-charter.graphql.org. + +The licenses governing the GraphQL Specification Project are: + +| Deliverable | License | +| -------------- | ------------------------------------------------------- | +| Specifications | [Open Web Foundation Agreement 1.0 Mode](http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0) (Patent and Copyright) +| Source code | [MIT License](https://opensource.org/licenses/MIT) +| Data sets | [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/) **Conformance** From 2d2f40a00ec6dfd2ca4f02dd0b92ceb29f3462c4 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 21 May 2021 11:41:10 -0400 Subject: [PATCH 2/3] Updates to spec preamble This commit makes a few updates to the legal text as recommended by Linux Foundation legal. Some of the changed lines may be trivial (spacing, etc) as I've replaced the existing text with what was provided to ensure all of the changes are captured. Signed-off-by: Brian Warner --- spec/GraphQL.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/spec/GraphQL.md b/spec/GraphQL.md index 1544458ec..9e1019c54 100644 --- a/spec/GraphQL.md +++ b/spec/GraphQL.md @@ -10,16 +10,20 @@ requirements of data models for client-server applications. The development of this open standard started in 2015. This specification was licensed under OWFa 1.0 in 2017. The [GraphQL Foundation](https://graphql.org/foundation/) was formed in 2019 as a neutral focal point for organizations who support the -GraphQL ecosystem, at which point the GraphQL Specification Project became a -[Joint Development Foundation](https://www.jointdevelopment.org/) project. If -your organization benefits from GraphQL, please consider becoming a member and -helping us to sustain the activities that support the health of our -neutral ecosystem. +GraphQL ecosystem, and the [GraphQL Specification +Project](https://graphql.org/community/) was established also in 2019 as the +Joint Development Foundation Projects, LLC, GraphQL Series. -GraphQL has evolved and may continue to evolve in future editions of this -specification. Previous editions of the GraphQL specification can be found at -permalinks that match their [release tag](https://github.com/graphql/graphql-spec/releases). -The latest working draft release can be found at [https://spec.graphql.org/draft](https://spec.graphql.org/draft). +If your organization benefits from GraphQL, please consider [becoming a +member](https://graphql.org/foundation/join/#graphql-foundation) and helping us +to sustain the activities that support the health of our neutral ecosystem. + +The GraphQL Specification Project has evolved and may continue to evolve in +future editions of this specification. Previous editions of the GraphQL +specification can be found at permalinks that match their [release +tag](https://github.com/graphql/graphql-spec/releases). The latest working +draft release can be found at +[https://spec.graphql.org/draft](https://spec.graphql.org/draft). **Copyright notice** @@ -43,14 +47,13 @@ POSSIBILITY OF SUCH DAMAGE. **Licensing** -The GraphQL Specification Project is made available by the -[Joint Development Foundation](https://www.jointdevelopment.org/). The current -[Working Group](https://github.com/graphql/graphql-wg) charter, which includes -the IP policy governing all working group deliverables (including -specifications, source code, and datasets) may be found at -https://technical-charter.graphql.org. +The GraphQL Specification Project is made available by the Joint Development +Foundation. The current Working Group charter, which includes the IP policy +governing all working group deliverables (including specifications, source +code, and datasets) may be found at +[https://technical-charter.graphql.org](https://technical-charter.graphql.org). -The licenses governing the GraphQL Specification Project are: +Currently, the licenses governing GraphQL Specification Project deliverables are: | Deliverable | License | | -------------- | ------------------------------------------------------- | From 7a290662ba584e75088d57f2ff2db0f91282687f Mon Sep 17 00:00:00 2001 From: Lee Byron Date: Fri, 21 May 2021 11:22:31 -0700 Subject: [PATCH 3/3] Format and add links --- spec/GraphQL.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/spec/GraphQL.md b/spec/GraphQL.md index 9e1019c54..226c9062b 100644 --- a/spec/GraphQL.md +++ b/spec/GraphQL.md @@ -10,19 +10,20 @@ requirements of data models for client-server applications. The development of this open standard started in 2015. This specification was licensed under OWFa 1.0 in 2017. The [GraphQL Foundation](https://graphql.org/foundation/) was formed in 2019 as a neutral focal point for organizations who support the -GraphQL ecosystem, and the [GraphQL Specification -Project](https://graphql.org/community/) was established also in 2019 as the -Joint Development Foundation Projects, LLC, GraphQL Series. +GraphQL ecosystem, and the +[GraphQL Specification Project](https://graphql.org/community/) was established +also in 2019 as the Joint Development Foundation Projects, LLC, GraphQL Series. -If your organization benefits from GraphQL, please consider [becoming a -member](https://graphql.org/foundation/join/#graphql-foundation) and helping us -to sustain the activities that support the health of our neutral ecosystem. +If your organization benefits from GraphQL, please consider +[becoming a member](https://graphql.org/foundation/join/#graphql-foundation) +and helping us to sustain the activities that support the health of our neutral +ecosystem. The GraphQL Specification Project has evolved and may continue to evolve in future editions of this specification. Previous editions of the GraphQL -specification can be found at permalinks that match their [release -tag](https://github.com/graphql/graphql-spec/releases). The latest working -draft release can be found at +specification can be found at permalinks that match their +[release tag](https://github.com/graphql/graphql-spec/releases). The latest +working draft release can be found at [https://spec.graphql.org/draft](https://spec.graphql.org/draft). @@ -47,10 +48,11 @@ POSSIBILITY OF SUCH DAMAGE. **Licensing** -The GraphQL Specification Project is made available by the Joint Development -Foundation. The current Working Group charter, which includes the IP policy -governing all working group deliverables (including specifications, source -code, and datasets) may be found at +The GraphQL Specification Project is made available by the +[Joint Development Foundation](https://www.jointdevelopment.org/). The current +[Working Group](https://github.com/graphql/graphql-wg) charter, which includes +the IP policy governing all working group deliverables (including specifications, +source code, and datasets) may be found at [https://technical-charter.graphql.org](https://technical-charter.graphql.org). Currently, the licenses governing GraphQL Specification Project deliverables are: