From ea9a6dd260b161ed3333fa0c2275416a334f75bb Mon Sep 17 00:00:00 2001
From: Thomas Bouffard <27200110+tbouffard@users.noreply.github.com>
Date: Thu, 11 Aug 2022 14:05:56 +0200
Subject: [PATCH] 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.
---
 .github/PULL_REQUEST_TEMPLATE.md |  2 +-
 LICENSE                          | 36 +++++++++++++++++++++++++-------
 NOTICE                           | 20 ++++++++++++++++++
 README.md                        |  9 +-------
 4 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 NOTICE

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b169a76c3..4f4f35948 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,7 @@ If this is a bug fix, your description should include "fixes #xxxx", or
 <!--
 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;
 https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop#part-3-contributing-to-projects-with-github-desktop
diff --git a/LICENSE b/LICENSE
index ccc3de19b..261eeb9e9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,7 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
    1. Definitions.
@@ -115,11 +119,6 @@
           or as an addendum to the NOTICE text from the Work, provided
           that such additional attribution notices cannot be construed
           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
       may provide additional or different license terms and conditions
@@ -176,6 +175,27 @@
 
    END OF TERMS AND CONDITIONS
 
-//SEIBERT/MEDIA GmbH, Wiesbaden, Germany is the exclusive licensee of 
-JGraph for software products based on this codebase within the Atlassian 
-ecosystem of products.
+   APPENDIX: How to apply the Apache License to your work.
+
+      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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000..3ae59071c
--- /dev/null
+++ b/NOTICE
@@ -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
diff --git a/README.md b/README.md
index 858c98647..7794c5b83 100644
--- a/README.md
+++ b/README.md
@@ -29,19 +29,12 @@ Chrome, Edge, Firefox, Safari, Chromium based browsers (Brave, Opera, ....) for
 
 ## 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.
 
 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
 
 Assuming your page defines an element with the id `graph-container`, the following will display a rectangle connected to an orange circle.