From 19fc55f408aa4a657d9a39e60f55d1219fad672b Mon Sep 17 00:00:00 2001 From: Devin Jeanpierre Date: Mon, 24 Apr 2017 10:49:00 -0700 Subject: [PATCH] Refactor authorship information for more technical accuracy. Google advises its employees to add Google Inc. as an author, but that hasn't been done yet and would be super inconvenient. So instead I've refactored the file to refer to "The JsonCpp Authors", which are listed in the AUTHORS file. The AUTHORS file itself is generated via: git log --pretty="%an <%ae>%n%cn <%ce>" | sort | uniq Plus the addition of "Google Inc." as a copyright author. (Google owns the work of anyone contributing from an @google.com address, for example.) The list contains some probable duplicates where people have used more than one email address. I didn't deduplicate because -- well, who's to say they're duplicates, anyway? :) --- AUTHORS | 110 +++++++++++++++++++++++++++++++++++++ LICENSE | 6 +- devtools/__init__.py | 2 +- devtools/antglob.py | 2 +- devtools/fixeol.py | 2 +- devtools/licenseupdater.py | 2 +- devtools/tarball.py | 2 +- makerelease.py | 2 +- scons-tools/globtool.py | 2 +- scons-tools/srcdist.py | 2 +- scons-tools/substinfile.py | 2 +- scons-tools/targz.py | 2 +- test/cleantests.py | 2 +- test/generate_expected.py | 2 +- test/pyjsontestrunner.py | 2 +- test/runjsontests.py | 2 +- test/rununittests.py | 2 +- 17 files changed, 128 insertions(+), 18 deletions(-) diff --git a/AUTHORS b/AUTHORS index c0fbbeec1..5747e61c1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,111 @@ Baptiste Lepilleur + +Aaron Jacobs +Aaron Jacobs +Adam Boseley +Adam Boseley +Aleksandr Derbenev <13alexac@gmail.com> +Alexander Gazarov +Alexander V. Brezgin +Alexandr Brezgin +Alexey Kruchinin +Anton Indrawan +Baptiste Jonglez +Baptiste Lepilleur +Baruch Siach +Ben Boeckel +Benjamin Knecht +Bernd Kuhls +Billy Donahue +Braden McDorman +Brandon Myers +Brendan Drew +chason +Chris Gilling +Christopher Dawes +Christopher Dunn +Chuck Atkins +Cody P Schafer +Connor Manning +Cory Quammen +Cristóvão B da Cruz e Silva +Daniel Krügler +Dani-Hub +Dan Liu +datadiode +datadiode +David Seifert +David West +dawesc +Dmitry Marakasov +dominicpezzuto +Don Milham +drgler +ds283 +Egor Tensin +eightnoteight +Evince +filipjs +findblar +Florian Meier +Gaëtan Lehmann +Gaurav +Gergely Nagy +Gida Pataki +I3ck +Iñaki Baz Castillo +Jacco +Jean-Christophe Fillion-Robin +Jonas Platte +Jörg Krause +Keith Lea +Kevin Grant +Kirill V. Lyadvinsky +Kirill V. Lyadvinsky +Kobi Gurkan +Magnus Bjerke Vik +Malay Shah +Mara Kim +Marek Kotewicz +Mark Lakata +Mark Zeren +Martin Buck +Martyn Gigg +Mattes D +Matthias Loy +Merlyn Morgan-Graham +Michael Shields +Michał Górny +Mike Naberezny +mloy +Motti +nnkur +Omkar Wagh +paulo +pavel.pimenov +Paweł Bylica +Péricles Lopes Machado +Peter Spiess-Knafl +pffang +Rémi Verschelde +renu555 +Robert Dailey +Sam Clegg +selaselah +Sergiy80 +sergzub +Stefan Schweter +Steffen Kieß +Steven Hahn +Stuart Eichert +SuperManitu +Techwolf +Tengiz Sharafiev +Tomasz Maciejewski +Vicente Olivert Riera +xiaoyur347 +ycqiu <429148848@qq.com> +yiqiju +Yu Xiaolei + +Google Inc. diff --git a/LICENSE b/LICENSE index ca2bfe1a0..55a3b2db9 100644 --- a/LICENSE +++ b/LICENSE @@ -2,12 +2,12 @@ The JsonCpp library's source code, including accompanying documentation, tests and demonstration applications, are licensed under the following conditions... -The author (Baptiste Lepilleur) explicitly disclaims copyright in all +The JsonCpp Authors explicitly disclaim copyright in all jurisdictions which recognize such a disclaimer. In such jurisdictions, this software is released into the Public Domain. In jurisdictions which do not recognize Public Domain property (e.g. Germany as of -2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is +2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is released under the terms of the MIT License (see below). In jurisdictions which recognize Public Domain property, the user of this @@ -23,7 +23,7 @@ described in clear, concise terms at: The full text of the MIT License follows: ======================================================================== -Copyright (c) 2007-2010 Baptiste Lepilleur +Copyright (c) 2007-2010 The JsonCpp Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devtools/__init__.py b/devtools/__init__.py index d18a52168..90b4fd7fb 100644 --- a/devtools/__init__.py +++ b/devtools/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/antglob.py b/devtools/antglob.py index c272f6634..75615ed41 100644 --- a/devtools/antglob.py +++ b/devtools/antglob.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/fixeol.py b/devtools/fixeol.py index b55e14616..e089f9f93 100644 --- a/devtools/fixeol.py +++ b/devtools/fixeol.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/licenseupdater.py b/devtools/licenseupdater.py index 6f823618f..43ddb4f46 100644 --- a/devtools/licenseupdater.py +++ b/devtools/licenseupdater.py @@ -6,7 +6,7 @@ # and ends with the first blank line. LICENSE_BEGIN = "// Copyright " -BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur +BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/tarball.py b/devtools/tarball.py index 2e72717ab..ce3659444 100644 --- a/devtools/tarball.py +++ b/devtools/tarball.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/makerelease.py b/makerelease.py index ea3722de4..6f9a2f24f 100644 --- a/makerelease.py +++ b/makerelease.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/globtool.py b/scons-tools/globtool.py index 890f1b7b1..1aa73fc79 100644 --- a/scons-tools/globtool.py +++ b/scons-tools/globtool.py @@ -1,4 +1,4 @@ -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/srcdist.py b/scons-tools/srcdist.py index fe1d74695..3c9b1418e 100644 --- a/scons-tools/srcdist.py +++ b/scons-tools/srcdist.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/substinfile.py b/scons-tools/substinfile.py index c620442d5..5d235e7ee 100644 --- a/scons-tools/substinfile.py +++ b/scons-tools/substinfile.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/targz.py b/scons-tools/targz.py index 8e5ba8300..9e2e8d468 100644 --- a/scons-tools/targz.py +++ b/scons-tools/targz.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/cleantests.py b/test/cleantests.py index 9772d542b..6a441dc5a 100644 --- a/test/cleantests.py +++ b/test/cleantests.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/generate_expected.py b/test/generate_expected.py index 0b74f51ce..4d56bce73 100644 --- a/test/generate_expected.py +++ b/test/generate_expected.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/pyjsontestrunner.py b/test/pyjsontestrunner.py index 7f38356ae..6111ea9e8 100644 --- a/test/pyjsontestrunner.py +++ b/test/pyjsontestrunner.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/runjsontests.py b/test/runjsontests.py index d21c02f38..d0c938685 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/rununittests.py b/test/rununittests.py index 08850ec1a..cffe2c70e 100644 --- a/test/rununittests.py +++ b/test/rununittests.py @@ -1,4 +1,4 @@ -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE