Skip to content

Commit 19fc55f

Browse files
committed
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? :)
1 parent acf7429 commit 19fc55f

17 files changed

+128
-18
lines changed

AUTHORS

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,111 @@
11
Baptiste Lepilleur <[email protected]>
2+
3+
Aaron Jacobs <[email protected]>
4+
Aaron Jacobs <[email protected]>
5+
Adam Boseley <[email protected]>
6+
Adam Boseley <[email protected]>
7+
Aleksandr Derbenev <[email protected]>
8+
Alexander Gazarov <[email protected]>
9+
Alexander V. Brezgin <[email protected]>
10+
Alexandr Brezgin <[email protected]>
11+
Alexey Kruchinin <[email protected]>
12+
Anton Indrawan <[email protected]>
13+
Baptiste Jonglez <[email protected]>
14+
Baptiste Lepilleur <[email protected]>
15+
Baruch Siach <[email protected]>
16+
Ben Boeckel <[email protected]>
17+
Benjamin Knecht <[email protected]>
18+
Bernd Kuhls <[email protected]>
19+
Billy Donahue <[email protected]>
20+
Braden McDorman <[email protected]>
21+
Brandon Myers <[email protected]>
22+
Brendan Drew <[email protected]>
23+
24+
Chris Gilling <[email protected]>
25+
Christopher Dawes <[email protected]>
26+
Christopher Dunn <[email protected]>
27+
Chuck Atkins <[email protected]>
28+
Cody P Schafer <[email protected]>
29+
Connor Manning <[email protected]>
30+
Cory Quammen <[email protected]>
31+
Cristóvão B da Cruz e Silva <[email protected]>
32+
Daniel Krügler <[email protected]>
33+
34+
Dan Liu <gzliudan>
35+
datadiode <[email protected]>
36+
datadiode <[email protected]>
37+
David Seifert <[email protected]>
38+
David West <[email protected]>
39+
40+
Dmitry Marakasov <[email protected]>
41+
dominicpezzuto <[email protected]>
42+
Don Milham <[email protected]>
43+
44+
45+
Egor Tensin <[email protected]>
46+
eightnoteight <[email protected]>
47+
48+
49+
50+
Florian Meier <[email protected]>
51+
Gaëtan Lehmann <[email protected]>
52+
53+
Gergely Nagy <[email protected]>
54+
Gida Pataki <[email protected]>
55+
56+
Iñaki Baz Castillo <[email protected]>
57+
58+
Jean-Christophe Fillion-Robin <[email protected]>
59+
Jonas Platte <[email protected]>
60+
Jörg Krause <[email protected]>
61+
Keith Lea <[email protected]>
62+
Kevin Grant <[email protected]>
63+
Kirill V. Lyadvinsky <[email protected]>
64+
Kirill V. Lyadvinsky <[email protected]>
65+
Kobi Gurkan <[email protected]>
66+
Magnus Bjerke Vik <[email protected]>
67+
Malay Shah <[email protected]>
68+
69+
Marek Kotewicz <[email protected]>
70+
Mark Lakata <[email protected]>
71+
Mark Zeren <[email protected]>
72+
Martin Buck <[email protected]>
73+
Martyn Gigg <[email protected]>
74+
75+
Matthias Loy <[email protected]>
76+
Merlyn Morgan-Graham <[email protected]>
77+
Michael Shields <[email protected]>
78+
Michał Górny <[email protected]>
79+
Mike Naberezny <[email protected]>
80+
81+
82+
83+
Omkar Wagh <[email protected]>
84+
85+
pavel.pimenov <[email protected]>
86+
Paweł Bylica <[email protected]>
87+
Péricles Lopes Machado <[email protected]>
88+
Peter Spiess-Knafl <[email protected]>
89+
90+
Rémi Verschelde <[email protected]>
91+
92+
Robert Dailey <[email protected]>
93+
Sam Clegg <[email protected]>
94+
selaselah <[email protected]>
95+
96+
97+
Stefan Schweter <[email protected]>
98+
Steffen Kieß <[email protected]>
99+
Steven Hahn <[email protected]>
100+
Stuart Eichert <[email protected]>
101+
SuperManitu <[email protected]>
102+
103+
Tengiz Sharafiev <[email protected]>
104+
Tomasz Maciejewski <[email protected]>
105+
Vicente Olivert Riera <[email protected]>
106+
xiaoyur347 <[email protected]>
107+
108+
109+
Yu Xiaolei <[email protected]>
110+
111+
Google Inc.

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ The JsonCpp library's source code, including accompanying documentation,
22
tests and demonstration applications, are licensed under the following
33
conditions...
44

5-
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
5+
The JsonCpp Authors explicitly disclaim copyright in all
66
jurisdictions which recognize such a disclaimer. In such jurisdictions,
77
this software is released into the Public Domain.
88

99
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
10-
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
10+
2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
1111
released under the terms of the MIT License (see below).
1212

1313
In jurisdictions which recognize Public Domain property, the user of this
@@ -23,7 +23,7 @@ described in clear, concise terms at:
2323
The full text of the MIT License follows:
2424

2525
========================================================================
26-
Copyright (c) 2007-2010 Baptiste Lepilleur
26+
Copyright (c) 2007-2010 The JsonCpp Authors
2727

2828
Permission is hereby granted, free of charge, to any person
2929
obtaining a copy of this software and associated documentation

devtools/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

devtools/antglob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# encoding: utf-8
3-
# Copyright 2009 Baptiste Lepilleur
3+
# Copyright 2009 The JsonCpp Authors
44
# Distributed under MIT license, or public domain if desired and
55
# recognized in your jurisdiction.
66
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

devtools/fixeol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

devtools/licenseupdater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# and ends with the first blank line.
77
LICENSE_BEGIN = "// Copyright "
88

9-
BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur
9+
BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors
1010
// Distributed under MIT license, or public domain if desired and
1111
// recognized in your jurisdiction.
1212
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

devtools/tarball.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

makerelease.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

scons-tools/globtool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009 Baptiste Lepilleur
1+
# Copyright 2009 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

scons-tools/srcdist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

scons-tools/substinfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

scons-tools/targz.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

test/cleantests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

test/generate_expected.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

test/pyjsontestrunner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

test/runjsontests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

test/rununittests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009 Baptiste Lepilleur
1+
# Copyright 2009 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

0 commit comments

Comments
 (0)