Skip to content

Commit

Permalink
Restore BL's authorship attribution, and add "The Jsoncpp Authors" wh…
Browse files Browse the repository at this point in the history
…ere it was missing.

Requested/noticed in open-source-parsers#610, and a
followup to open-source-parsers#607 .
  • Loading branch information
ssbr committed Jul 21, 2017
1 parent f26edb0 commit 59e4d35
Show file tree
Hide file tree
Showing 35 changed files with 38 additions and 38 deletions.
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/antglob.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/fixeol.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion devtools/licenseupdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# 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
Expand Down
2 changes: 1 addition & 1 deletion devtools/tarball.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/allocator.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/assertions.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/autolink.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/config.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/features.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/forwards.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/json.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/reader.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/value.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/json/writer.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion makerelease.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/globtool.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/srcdist.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/substinfile.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/targz.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/jsontestrunner/main.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib_json/json_reader.cpp
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/lib_json/json_tool.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib_json/json_value.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib_json/json_valueiterator.inl
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib_json/json_writer.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test_lib_json/jsontest.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test_lib_json/jsontest.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test_lib_json/main.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/cleantests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/generate_expected.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/pyjsontestrunner.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/runjsontests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/rununittests.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 59e4d35

Please sign in to comment.