From f85465bbfd14b8a6b6da563cbcddd2ece11c05da Mon Sep 17 00:00:00 2001 From: Chris Black Date: Sat, 13 Jul 2024 10:58:46 -0700 Subject: [PATCH 1/2] relicense shiny /data-ingest with approval from all contributors --- shiny/Data-Ingest/LICENSE | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/shiny/Data-Ingest/LICENSE b/shiny/Data-Ingest/LICENSE index 5a9e44128f1..09ef35a60b4 100644 --- a/shiny/Data-Ingest/LICENSE +++ b/shiny/Data-Ingest/LICENSE @@ -1,34 +1,3 @@ -## This is the master copy of the PEcAn License - -University of Illinois/NCSA Open Source License - -Copyright (c) 2012, University of Illinois, NCSA. All rights reserved. - -PEcAn project -www.pecanproject.org - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal with the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -- Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimers. -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. -- Neither the names of University of Illinois, NCSA, nor the names - of its contributors may be used to endorse or promote products - derived from this Software without specific prior written permission. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. - +YEAR: 2024 +COPYRIGHT HOLDER: PEcAn Project +ORGANIZATION: PEcAn Project, authors affiliations From a9fb6aca47d36102ee15d08560f6a11a54463630 Mon Sep 17 00:00:00 2001 From: Chris Black Date: Sun, 14 Jul 2024 08:06:25 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca98aa0a0d..f7ba5828646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ For more information about this file see also [Keep a Changelog](http://keepacha ### Changed - The following components have changed their licensing. With approval of all their contributors, we now provide them under a BSD 3-clause license rather than the previously used NCSA Open Source license. As a reminder, we intend to relicense the entire system and this list will expand as we gather permission from the relevant copyright owners. - * Shiny apps `dbsync` and `Elicitation` + * Shiny apps `dbsync`, `Data-Ingest`, and `Elicitation` * Base package `PEcAn.all` * Model packages `PEcAn.LDNDC` and `PEcAn.SIBCASA`