From 59e4d35339f6e5791d214312113b46eda41df4ed Mon Sep 17 00:00:00 2001 From: Devin Jeanpierre Date: Fri, 21 Jul 2017 03:44:36 -0700 Subject: [PATCH] Restore BL's authorship attribution, and add "The Jsoncpp Authors" where it was missing. Requested/noticed in https://github.com/open-source-parsers/jsoncpp/pull/610, and a followup to https://github.com/open-source-parsers/jsoncpp/pull/607 . --- LICENSE | 8 ++++---- devtools/__init__.py | 2 +- devtools/antglob.py | 2 +- devtools/fixeol.py | 2 +- devtools/licenseupdater.py | 2 +- devtools/tarball.py | 2 +- include/json/allocator.h | 2 +- include/json/assertions.h | 2 +- include/json/autolink.h | 2 +- include/json/config.h | 2 +- include/json/features.h | 2 +- include/json/forwards.h | 2 +- include/json/json.h | 2 +- include/json/reader.h | 2 +- include/json/value.h | 2 +- include/json/writer.h | 2 +- makerelease.py | 2 +- scons-tools/globtool.py | 2 +- scons-tools/srcdist.py | 2 +- scons-tools/substinfile.py | 2 +- scons-tools/targz.py | 2 +- src/jsontestrunner/main.cpp | 2 +- src/lib_json/json_reader.cpp | 2 +- src/lib_json/json_tool.h | 2 +- src/lib_json/json_value.cpp | 2 +- src/lib_json/json_valueiterator.inl | 2 +- src/lib_json/json_writer.cpp | 2 +- src/test_lib_json/jsontest.cpp | 2 +- src/test_lib_json/jsontest.h | 2 +- src/test_lib_json/main.cpp | 2 +- test/cleantests.py | 2 +- test/generate_expected.py | 2 +- test/pyjsontestrunner.py | 2 +- test/runjsontests.py | 2 +- test/rununittests.py | 2 +- 35 files changed, 38 insertions(+), 38 deletions(-) diff --git a/LICENSE b/LICENSE index 55a3b2d..89280a6 100644 --- a/LICENSE +++ b/LICENSE @@ -2,13 +2,13 @@ The JsonCpp library's source code, including accompanying documentation, tests and demonstration applications, are licensed under the following conditions... -The JsonCpp Authors explicitly disclaim copyright in all +Baptiste Lepilleur and 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 The JsonCpp Authors, and is -released under the terms of the MIT License (see below). +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +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 software may choose to accept it either as 1) Public Domain, 2) under the @@ -23,7 +23,7 @@ described in clear, concise terms at: The full text of the MIT License follows: ======================================================================== -Copyright (c) 2007-2010 The JsonCpp Authors +Copyright (c) 2007-2010 Baptiste Lepilleur and 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 90b4fd7..4a51e65 100644 --- a/devtools/__init__.py +++ b/devtools/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and 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 75615ed..9843765 100644 --- a/devtools/antglob.py +++ b/devtools/antglob.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and 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 e089f9f..45252a0 100644 --- a/devtools/fixeol.py +++ b/devtools/fixeol.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and 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 43ddb4f..36bdb5c 100644 --- a/devtools/licenseupdater.py +++ b/devtools/licenseupdater.py @@ -6,7 +6,7 @@ from __future__ import print_function # and ends with the first blank line. LICENSE_BEGIN = "// Copyright " -BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors +BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur and 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 ce36594..3c0ba65 100644 --- a/devtools/tarball.py +++ b/devtools/tarball.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and 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/include/json/allocator.h b/include/json/allocator.h index 2492758..9c7e573 100644 --- a/include/json/allocator.h +++ b/include/json/allocator.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/assertions.h b/include/json/assertions.h index 9c5f8bc..1cca28d 100644 --- a/include/json/assertions.h +++ b/include/json/assertions.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/autolink.h b/include/json/autolink.h index 6fcc8af..b2c0f00 100644 --- a/include/json/autolink.h +++ b/include/json/autolink.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/config.h b/include/json/config.h index 6e3f3ac..b2bfb29 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/features.h b/include/json/features.h index de45248..72eb6a8 100644 --- a/include/json/features.h +++ b/include/json/features.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/forwards.h b/include/json/forwards.h index ccfe09a..70bbe19 100644 --- a/include/json/forwards.h +++ b/include/json/forwards.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/json.h b/include/json/json.h index 8f10ac2..3d2798a 100644 --- a/include/json/json.h +++ b/include/json/json.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/reader.h b/include/json/reader.h index 6ab5bdb..5ee962a 100644 --- a/include/json/reader.h +++ b/include/json/reader.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/value.h b/include/json/value.h index ba7365c..f057089 100644 --- a/include/json/value.h +++ b/include/json/value.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/include/json/writer.h b/include/json/writer.h index d0944ee..8a1279b 100644 --- a/include/json/writer.h +++ b/include/json/writer.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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 6f9a2f2..ba2e9aa 100644 --- a/makerelease.py +++ b/makerelease.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and 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 1aa73fc..e51af0f 100644 --- a/scons-tools/globtool.py +++ b/scons-tools/globtool.py @@ -1,4 +1,4 @@ -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and 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 3c9b141..afbd2fa 100644 --- a/scons-tools/srcdist.py +++ b/scons-tools/srcdist.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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 5d235e7..7e9d526 100644 --- a/scons-tools/substinfile.py +++ b/scons-tools/substinfile.py @@ -1,4 +1,4 @@ -# Copyright 2010 The JsonCpp Authors +# Copyright 2010 Baptiste Lepilleur and 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 9e2e8d4..f5a98ba 100644 --- a/scons-tools/targz.py +++ b/scons-tools/targz.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp index 45db464..c4cfa05 100644 --- a/src/jsontestrunner/main.cpp +++ b/src/jsontestrunner/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index ec79075..23d732c 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2011 Baptiste Lepilleur +// Copyright 2007-2011 Baptiste Lepilleur and The JsonCpp Authors // Copyright (C) 2016 InfoTeCS JSC. All rights reserved. // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h index 41d0f49..4316178 100644 --- a/src/lib_json/json_tool.h +++ b/src/lib_json/json_tool.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 5f5cf8b..056c475 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -1,4 +1,4 @@ -// Copyright 2011 Baptiste Lepilleur +// Copyright 2011 Baptiste Lepilleur and 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/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl index b45162b..5243bfe 100644 --- a/src/lib_json/json_valueiterator.inl +++ b/src/lib_json/json_valueiterator.inl @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index 4fb186d..02f1cb1 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -1,4 +1,4 @@ -// Copyright 2011 Baptiste Lepilleur +// Copyright 2011 Baptiste Lepilleur and 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/src/test_lib_json/jsontest.cpp b/src/test_lib_json/jsontest.cpp index 4c10a37..f8c0767 100644 --- a/src/test_lib_json/jsontest.cpp +++ b/src/test_lib_json/jsontest.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h index f0ba1fa..955317d 100644 --- a/src/test_lib_json/jsontest.h +++ b/src/test_lib_json/jsontest.h @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 47cd981..44f6591 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2007-2010 Baptiste Lepilleur +// Copyright 2007-2010 Baptiste Lepilleur and 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 6a441dc..36d5b9b 100644 --- a/test/cleantests.py +++ b/test/cleantests.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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 4d56bce..e049ab5 100644 --- a/test/generate_expected.py +++ b/test/generate_expected.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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 6111ea9..bd749b5 100644 --- a/test/pyjsontestrunner.py +++ b/test/pyjsontestrunner.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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 d0c9386..48cfe82 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -1,4 +1,4 @@ -# Copyright 2007 The JsonCpp Authors +# Copyright 2007 Baptiste Lepilleur and 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 cffe2c7..6634e72 100644 --- a/test/rununittests.py +++ b/test/rununittests.py @@ -1,4 +1,4 @@ -# Copyright 2009 The JsonCpp Authors +# Copyright 2009 Baptiste Lepilleur and 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