From 79df7673143c5eec1569868e71c0dd3b5376398d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Wed, 23 Mar 2022 14:48:34 +0100 Subject: [PATCH] Bump JSONLab to version 2.0 We were previously using version 1.8. --- contrib/jsonlab | 2 +- license.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/contrib/jsonlab b/contrib/jsonlab index d2b2421f1..5a58fafdc 160000 --- a/contrib/jsonlab +++ b/contrib/jsonlab @@ -1 +1 @@ -Subproject commit d2b2421f1d70dae079238c9a6412b5e0825ee0ef +Subproject commit 5a58fafdca239e61be4d7b2270307b2445bb571a diff --git a/license.txt b/license.txt index 0eb4ff6ea..61a2f6a5d 100644 --- a/license.txt +++ b/license.txt @@ -374,8 +374,26 @@ Copyright: 2007-2019 Dynare Team License: CC-BY-SA-4.0 Files: contrib/jsonlab/* -Copyright: 2011-2018 Qianqian Fang -License: BSD-2-clause or GPL-3+ +Copyright: 2011-2020 Qianqian Fang + 2016 Bastian Bechtold +License: GPL-3+ or BSD-3-clause + +Files: contrib/jsonlab/base64decode.m + contrib/jsonlab/base64encode.m + contrib/jsonlab/gzipdecode.m + contrib/jsonlab/gzipencode.m + contrib/jsonlab/zlibdecode.m + contrib/jsonlab/zlibencode.m +Copyright: 2012 Kota Yamaguchi + 2011-2020 Qianqian Fang +License: GPL-3+ or BSD-2-clause + +Files: contrib/jsonlab/loadjson.m +Copyright: 2011-2020 Qianqian Fang + 2009 Nedialko Krouchev + 2009 François Glineur + 2008 Joel Feenstra +License: GPL-3+ or BSD-2-clause or BSD-3-clause Files: contrib/ms-sbvar/utilities_dw/* Copyright: 1996-2011 Daniel Waggoner @@ -483,6 +501,32 @@ License: BSD-2-clause ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + . + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + * Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + License: GFDL-NIV-1.3+ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or