chore: restore Apache 2.0 license + add a NOTICE file (#95)

- Create a NOTICE file. It references the list of contributors that re-licensed their commits to Apache License, Version 2.0.
- So we can restore the Apache-2.0 license.
- Also update the README and the Pull Request template as there is no more warning about the license.
development
Thomas Bouffard 2022-08-11 14:05:56 +02:00 committed by GitHub
parent 311514dca3
commit ea9a6dd260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 17 deletions

View File

@ -16,7 +16,7 @@ If this is a bug fix, your description should include "fixes #xxxx", or
<!-- <!--
Thanks for submitting a pull request! Thanks for submitting a pull request!
All contributions to this project must be under the terms of the Apache 2.0 license as stated in https://www.apache.org/licenses/LICENSE-2.0 All contributions to this project are done under the terms of the Apache 2.0 license as stated in https://www.apache.org/licenses/LICENSE-2.0
Please make sure you read github's contributing guidelines; Please make sure you read github's contributing guidelines;
https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop#part-3-contributing-to-projects-with-github-desktop https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop#part-3-contributing-to-projects-with-github-desktop

36
LICENSE
View File

@ -1,3 +1,7 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions. 1. Definitions.
@ -116,11 +120,6 @@
that such additional attribution notices cannot be construed that such additional attribution notices cannot be construed
as modifying the License. as modifying the License.
(e) Neither the Work nor Derivative Works may be used or form any
part of a larger work that integrates or is supposed to be
integrated with a product or service owned or marketed by an
Atlassian entity, including its successors and assignees in title.
You may add Your own copyright statement to Your modifications and You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or for use, reproduction, or distribution of Your modifications, or
@ -176,6 +175,27 @@
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
//SEIBERT/MEDIA GmbH, Wiesbaden, Germany is the exclusive licensee of APPENDIX: How to apply the Apache License to your work.
JGraph for software products based on this codebase within the Atlassian
ecosystem of products. To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.

20
NOTICE Normal file
View File

@ -0,0 +1,20 @@
maxGraph contributors
==========
The initial contributions to maxGraph were made under a modified version of the Apache License, Version 2.0.
The following contributors (arbitrarily sorted according to their names) re-licensed their commits under the Apache License, Version 2.0. See https://github.com/maxGraph/maxGraph/issues/89 for more details.
- 7fa2b43 by CD Yang (https://github.com/cd-yang)
- 5d4f197, 82321b3, a5ac1ab and c85074e by David Benson (https://github.com/davidjgraph)
- (all commits) Dave Morrissey (https://github.com/mcyph)
- 07d1b62 Gary Kaganas (https://github.com/Seebiscuit)
- (all commits) Junsik Shim (https://github.com/junsikshim)
- fb7819f, 14f5815, a2a718b, 443ebf7, 3a1b08c, 760cbd3 Thomas Bouffard (https://github.com/tbouffard)
The TypeScript migration of the mxGraph javascript code involved the reuse of types taken from the typed-mxgraph project, released under the MIT license (https://github.com/typed-mxgraph/typed-mxgraph).
==========
maxGraph is derived from mxGraph, released under the Apache License, Version 2.0
Copyright (c) 2006-2015, JGraph Ltd
Copyright (c) 2006-2015, Gaudenz Alder

View File

@ -29,19 +29,12 @@ Chrome, Edge, Firefox, Safari, Chromium based browsers (Brave, Opera, ....) for
## Project status ## Project status
maxGraph is under active development. An alpha version will be released soon with the npm package once [licensing](#license) maxGraph is under active development. An alpha version will be released soon (along with the npm package) once [licensing](https://github.com/maxGraph/maxGraph/issues/89)
and [versioning](https://github.com/maxGraph/maxGraph/issues/92) issues have been resolved. and [versioning](https://github.com/maxGraph/maxGraph/issues/92) issues have been resolved.
In the meantime, you can test the project by running the [Storybook examples](#development) or [build the npm package locally](#build-local-npm-package). In the meantime, you can test the project by running the [Storybook examples](#development) or [build the npm package locally](#build-local-npm-package).
## <a id="license"></a> Transition to Apache 2.0 license
This project is published under the terms of a [Modified-Apache-2.0](LICENSE) license and currently preparing to move back to the standard Apache 2.0 license.
From now on, all contributions to this project must be under the terms of the Apaches 2.0 license as stated in https://www.apache.org/licenses/LICENSE-2.0.
See https://github.com/maxGraph/maxGraph/issues/89 for more details.
## Getting Started ## Getting Started
Assuming your page defines an element with the id `graph-container`, the following will display a rectangle connected to an orange circle. Assuming your page defines an element with the id `graph-container`, the following will display a rectangle connected to an orange circle.