From 0be4dc08d54831e03121ee2ffd5707a0c04ef593 Mon Sep 17 00:00:00 2001 From: Craig <3979063+craig8@users.noreply.github.com> Date: Wed, 8 Nov 2023 22:03:41 +0000 Subject: [PATCH] Update copyright/license --- COPYRIGHT | 26 -------------------------- DISCLAIMER | 26 ++++++++++++++++++++++++++ LICENSE | 19 +++++++++++++++++++ LICENSE.md | 11 ----------- 4 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 COPYRIGHT create mode 100644 DISCLAIMER create mode 100644 LICENSE delete mode 100644 LICENSE.md diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index e90bc43195..0000000000 --- a/COPYRIGHT +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022, Battelle Memorial Institute. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. 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. -# -# 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. -# diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000000..23106ccc96 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,26 @@ +Disclaimer + +This material was prepared as an account of work sponsored by an agency +of the United States Government. Neither the United States Government +nor the United States Department of Energy, nor Battelle, nor any of +their employees, nor any jurisdiction or organization that has cooperated +in the development of these materials, makes any warranty, express or +implied, or assumes any legal liability or responsibility for the accuracy, +completeness, or usefulness or any information, apparatus, product, software, +or process disclosed, or represents that its use would not infringe privately +owned rights. + +Reference herein to any specific commercial product, process, or service by +trade name, trademark, manufacturer, or otherwise does not necessarily +constitute or imply its endorsement, recommendation, or favoring by the United +States Government or any agency thereof, or Battelle Memorial Institute. The +views and opinions of authors expressed herein do not necessarily state or +reflect those of the United States Government or any agency thereof. + + + PACIFIC NORTHWEST NATIONAL LABORATORY + operated by + BATTELLE + for the + UNITED STATES DEPARTMENT OF ENERGY + under Contract DE-AC05-76RL01830 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..8e86760c69 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ + +Copyright 2023, Battelle Memorial Institute. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not +use this file except in compliance with the License. You may obtain a copy +of the License at + + + +The patent license grant shall only be applicable to the following patent +and patent application (Battelle IPID 17008-E), as assigned to the Battelle +Memorial Institute, as used in conjunction with this Work: +• US Patent No. 9,094,385, issued 7/28/15 • USPTO Patent App. No. 14/746,577, +filed 6/22/15, published as US 2016-0006569. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 5eced6f461..0000000000 --- a/LICENSE.md +++ /dev/null @@ -1,11 +0,0 @@ - - -Copyright 2022, Battelle Memorial Institute. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -The patent license grant shall only be applicable to the following patent and patent application (Battelle IPID 17008-E), as assigned to the Battelle Memorial Institute, as used in conjunction with this Work: • US Patent No. 9,094,385, issued 7/28/15 • USPTO Patent App. No. 14/746,577, filed 6/22/15, published as US 2016-0006569. - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.