Add AUTHORS, update COPYING and license file names.
authorWard Vandewege <ward@curoverse.com>
Wed, 5 Jul 2017 08:06:56 +0000 (04:06 -0400)
committerWard Vandewege <ward@curoverse.com>
Wed, 5 Jul 2017 08:06:56 +0000 (04:06 -0400)
refs #2411

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curoverse.com>

AUTHORS [new file with mode: 0644]
COPYING
apache-2.0.txt [moved from LICENSE-2.0.txt with 100% similarity]
cc-by-sa-3.0.txt [moved from by-sa-3.0.txt with 100% similarity]

diff --git a/AUTHORS b/AUTHORS
new file mode 100644 (file)
index 0000000..3933d54
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,17 @@
+# Names should be added to this file with this pattern:
+#
+# For individuals:
+#   Name <email address>
+#
+# For organizations:
+#   Organization <fnmatch pattern>
+#
+# See python fnmatch module documentation for more information.
+
+Curoverse, Inc. <*@curoverse.com>
+Adam Savitzky <adam.savitzky@gmail.com>
+Colin Nolan <colin.nolan@sanger.ac.uk>
+David <davide.fiorentino.loregio@gmail.com>
+Guillermo Carrasco <guille.ch.88@gmail.com>
+Joshua Randall <joshua.randall@sanger.ac.uk>
+Thomas Mooney <tmooney@genome.wustl.edu>
diff --git a/COPYING b/COPYING
index 2cba2ad20a1fbf4aeae5e00ad55f64ed0eeb5b47..61c31397a00534ef01dee6aa9ef3e1aa4b33f6c0 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,15 +1,19 @@
-Server-side components of Arvados contained in the apps/ and services/
-directories, including the API Server, Workbench, and Crunch, are licensed
-under the GNU Affero General Public License version 3 (see agpl-3.0.txt).
+Unless indicated otherwise in the header of the file, the files in this
+repository are distributed under one of three different licenses: AGPL-3.0,
+Apache-2.0 or CC-BY-SA-3.0.
 
-The files and directories under the build/, lib/ and tools/ directories are
-licensed under the GNU Affero General Public License version 3 (see
-agpl-3.0.txt).
+Individual files contain an SPDX tag that indicates the license for the file.
+These are the three tags in use:
 
-The Arvados client Software Development Kits contained in the sdk/ directory,
-example scripts in the crunch_scripts/ directory, the files and directories
-under backports/ and docker/, and code samples in the Aravados documentation
-are licensed under the Apache License, Version 2.0 (see LICENSE-2.0.txt).
+    SPDX-License-Identifier: AGPL-3.0
+    SPDX-License-Identifier: Apache-2.0
+    SPDX-License-Identifier: CC-BY-SA-3.0
 
-The Arvados Documentation located in the doc/ directory is licensed under the
-Creative Commons Attribution-Share Alike 3.0 United States (see by-sa-3.0.txt).
+This enables machine processing of license information based on the SPDX
+License Identifiers that are available here: http://spdx.org/licenses/
+
+The full license text for each license is available in this directory:
+
+  AGPL-3.0:     agpl-3.0.txt
+  Apache-2.0:   apache-2.0.txt
+  CC-BY-SA-3.0: cc-by-sa-3.0.txt
similarity index 100%
rename from LICENSE-2.0.txt
rename to apache-2.0.txt
similarity index 100%
rename from by-sa-3.0.txt
rename to cc-by-sa-3.0.txt