diff --git a/spdx-utils/src/main/kotlin/SpdxLicense.kt b/spdx-utils/src/main/kotlin/SpdxLicense.kt
index 755f69c04c46..31dc56d0a372 100644
--- a/spdx-utils/src/main/kotlin/SpdxLicense.kt
+++ b/spdx-utils/src/main/kotlin/SpdxLicense.kt
@@ -432,6 +432,8 @@ enum class SpdxLicense(
ISC("ISC"),
/** JasPer License */
JASPER_2_0("JasPer-2.0"),
+ /** Japan Network Information Center License */
+ JPNIC("JPNIC"),
/** JSON License */
JSON("JSON"),
/** Licence Art Libre 1.2 */
@@ -470,6 +472,8 @@ enum class SpdxLicense(
LGPL_3_0_OR_LATER("LGPL-3.0-or-later"),
/** libpng License */
LIBPNG("Libpng"),
+ /** PNG Reference Library version 2 */
+ LIBPNG_2_0("libpng-2.0"),
/** libtiff License */
LIBTIFF("libtiff"),
/** Licence Libre du Québec – Permissive version 1.1 */
diff --git a/spdx-utils/src/main/kotlin/SpdxLicenseException.kt b/spdx-utils/src/main/kotlin/SpdxLicenseException.kt
index af3aae3acf6d..5cf8b3db781f 100644
--- a/spdx-utils/src/main/kotlin/SpdxLicenseException.kt
+++ b/spdx-utils/src/main/kotlin/SpdxLicenseException.kt
@@ -64,6 +64,8 @@ enum class SpdxLicenseException(
GCC_EXCEPTION_3_1("GCC-exception-3.1"),
/** GNU JavaMail exception */
GNU_JAVAMAIL_EXCEPTION("gnu-javamail-exception"),
+ /** GPL Cooperation Commitment 1.0 */
+ GPL_CC_1_0("GPL-CC-1.0"),
/** i2p GPL+Java Exception */
I2P_GPL_JAVA_EXCEPTION("i2p-gpl-java-exception"),
/** Libtool Exception */
diff --git a/spdx-utils/src/main/resources/exceptions/GCC-exception-3.1 b/spdx-utils/src/main/resources/exceptions/GCC-exception-3.1
index 5c1c2c628698..e86f7fb58a46 100644
--- a/spdx-utils/src/main/resources/exceptions/GCC-exception-3.1
+++ b/spdx-utils/src/main/resources/exceptions/GCC-exception-3.1
@@ -2,29 +2,71 @@ GCC RUNTIME LIBRARY EXCEPTION
Version 3.1, 31 March 2009
-Copyright © 2009 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
-This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of the file stating that the file is governed by GPLv3 along with this Exception.
+This GCC Runtime Library Exception ("Exception") is an additional
+permission under section 7 of the GNU General Public License, version
+3 ("GPLv3"). It applies to a given file (the "Runtime Library") that
+bears a notice placed by the copyright holder of the file stating that
+the file is governed by GPLv3 along with this Exception.
-When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to use, in this way, the header files and runtime libraries covered by this Exception.
+When you use GCC to compile a program, GCC may combine portions of
+certain GCC header files and runtime libraries with the compiled
+program. The purpose of this Exception is to allow compilation of
+non-GPL (including proprietary) programs to use, in this way, the
+header files and runtime libraries covered by this Exception.
0. Definitions.
-A file is an "Independent Module" if it either requires the Runtime Library for execution after a Compilation Process, or makes use of an interface provided by the Runtime Library, but is not otherwise based on the Runtime Library.
-"GCC" means a version of the GNU Compiler Collection, with or without modifications, governed by version 3 (or a specified later version) of the GNU General Public License (GPL) with the option of using any subsequent versions published by the FSF.
+A file is an "Independent Module" if it either requires the Runtime
+Library for execution after a Compilation Process, or makes use of an
+interface provided by the Runtime Library, but is not otherwise based
+on the Runtime Library.
-"GPL-compatible Software" is software whose conditions of propagation, modification and use would permit combination with GCC in accord with the license of GCC.
+"GCC" means a version of the GNU Compiler Collection, with or without
+modifications, governed by version 3 (or a specified later version) of
+the GNU General Public License (GPL) with the option of using any
+subsequent versions published by the FSF.
-"Target Code" refers to output from any compiler for a real or virtual target processor architecture, in executable form or suitable for input to an assembler, loader, linker and/or execution phase. Notwithstanding that, Target Code does not include data in any format that is used as a compiler intermediate representation, or used for producing a compiler intermediate representation.
+"GPL-compatible Software" is software whose conditions of propagation,
+modification and use would permit combination with GCC in accord with
+the license of GCC.
-The "Compilation Process" transforms code entirely represented in non-intermediate languages designed for human-written code, and/or in Java Virtual Machine byte code, into Target Code. Thus, for example, use of source code generators and preprocessors need not be considered part of the Compilation Process, since the Compilation Process can be understood as starting with the output of the generators or preprocessors.
+"Target Code" refers to output from any compiler for a real or virtual
+target processor architecture, in executable form or suitable for
+input to an assembler, loader, linker and/or execution
+phase. Notwithstanding that, Target Code does not include data in any
+format that is used as a compiler intermediate representation, or used
+for producing a compiler intermediate representation.
-A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC intermediate representations would not qualify as an Eligible Compilation Process.
+The "Compilation Process" transforms code entirely represented in
+non-intermediate languages designed for human-written code, and/or in
+Java Virtual Machine byte code, into Target Code. Thus, for example,
+use of source code generators and preprocessors need not be considered
+part of the Compilation Process, since the Compilation Process can be
+understood as starting with the output of the generators or
+preprocessors.
+
+A Compilation Process is "Eligible" if it is done using GCC, alone or
+with other GPL-compatible software, or if it is done without using any
+work based on GCC. For example, using non-GPL-compatible Software to
+optimize any GCC intermediate representations would not qualify as an
+Eligible Compilation Process.
1. Grant of Additional Permission.
-You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules, even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the licensing of the Independent Modules.
+
+You have permission to propagate a work of Target Code formed by
+combining the Runtime Library with Independent Modules, even if such
+propagation would otherwise violate the terms of GPLv3, provided that
+all Target Code was generated by Eligible Compilation Processes. You
+may then convey such a combination under terms of your choice,
+consistent with the licensing of the Independent Modules.
2. No Weakening of GCC Copyleft.
-The availability of this Exception does not imply any general presumption that third-party software is unaffected by the copyleft requirements of the license of GCC.
+
+The availability of this Exception does not imply any general
+presumption that third-party software is unaffected by the copyleft
+requirements of the license of GCC.
diff --git a/spdx-utils/src/main/resources/exceptions/GPL-CC-1.0 b/spdx-utils/src/main/resources/exceptions/GPL-CC-1.0
new file mode 100644
index 000000000000..7583817ba4ef
--- /dev/null
+++ b/spdx-utils/src/main/resources/exceptions/GPL-CC-1.0
@@ -0,0 +1,17 @@
+GPL Cooperation Commitment Version 1.0
+
+Before filing or continuing to prosecute any legal proceeding or claim (other than a Defensive Action) arising from termination of a Covered License, we commit to extend to the person or entity ('you') accused of violating the Covered License the following provisions regarding cure and reinstatement, taken from GPL version 3. As used here, the term 'this License' refers to the specific Covered License being enforced.
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+We intend this Commitment to be irrevocable, and binding and enforceable against us and assignees of or successors to our copyrights.
+
+Definitions :
+
+"Covered License" means the GNU General Public License, version 2 (GPLv2), the GNU Lesser General Public License, version 2.1 (LGPLv2.1), or the GNU Library General Public License, version 2 (LGPLv2), all as published by the Free Software Foundation.
+
+"Defensive Action" means a legal proceeding or claim that We bring against you in response to a prior proceeding or claim initiated by you or your affiliate.
+
+"We" means each contributor to this repository as of the date of inclusion of this file, including subsidiaries of a corporate contributor. This work is available under a Creative Commons Attribution-ShareAlike 4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
diff --git a/spdx-utils/src/main/resources/licenses/APL-1.0 b/spdx-utils/src/main/resources/licenses/APL-1.0
index 020e237fff0e..927d92b52b14 100644
--- a/spdx-utils/src/main/resources/licenses/APL-1.0
+++ b/spdx-utils/src/main/resources/licenses/APL-1.0
@@ -1,5 +1,3 @@
-Open Source Initiative OSI - Adaptive Public License 1.0
-
ADAPTIVE PUBLIC LICENSE
Version 1.0
THE LICENSED WORK IS PROVIDED UNDER THE TERMS OF THIS ADAPTIVE PUBLIC LICENSE ("LICENSE"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE LICENSED WORK CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS LICENSE AND ITS TERMS, WHETHER OR NOT SUCH RECIPIENT READS THE TERMS OF THIS LICENSE. "LICENSED WORK" AND "RECIPIENT" ARE DEFINED BELOW.
diff --git a/spdx-utils/src/main/resources/licenses/BSD-3-Clause-No-Nuclear-Warranty b/spdx-utils/src/main/resources/licenses/BSD-3-Clause-No-Nuclear-Warranty
index 992925e8dedf..ea1df877eb8d 100644
--- a/spdx-utils/src/main/resources/licenses/BSD-3-Clause-No-Nuclear-Warranty
+++ b/spdx-utils/src/main/resources/licenses/BSD-3-Clause-No-Nuclear-Warranty
@@ -13,7 +13,7 @@ Neither the name of Sun Microsystems, Inc. or the names of contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
-This software is provided "AS IS," without a warranty of any kind. ALL
+THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT A WARRANTY OF ANY KIND. ALL
EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC.
diff --git a/spdx-utils/src/main/resources/licenses/JPNIC b/spdx-utils/src/main/resources/licenses/JPNIC
new file mode 100644
index 000000000000..8fad8aaa5568
--- /dev/null
+++ b/spdx-utils/src/main/resources/licenses/JPNIC
@@ -0,0 +1,39 @@
+Japan Network Information Center License
+
+Copyright (c) 2000-2002 Japan Network Information Center . All rights reserved.
+
+By using this file, you agree to the terms and conditions set forth bellow .
+
+LICENSE TERMS AND CONDITIONS
+
+The following License Terms and Conditions apply, unless a different license
+is obtained from Japan Network Information Center (" JPNIC "), a Japanese
+association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, Chiyoda-ku,
+Tokyo 101-0047, Japan .
+
+1. Use, Modification and Redistribution (including distribution of any modified
+or derived work) in source and/or binary forms is permitted under this License
+Terms and Conditions.
+
+2. Redistribution of source code must retain the copyright notices as they
+appear in each source code file, this License Terms and Conditions.
+
+3. Redistribution in binary form must reproduce the Copyright Notice, this
+License Terms and Conditions, in the documentation and/or other materials
+provided with the distribution. For the purposes of binary distribution the
+"Copyright Notice" refers to the following language: "Copyright (c) 2000-2002
+Japan Network Information Center . All rights reserved."
+
+4. The name of JPNIC may not be used to endorse or promote products derived
+from this Software without specific prior written approval of JPNIC .
+
+5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC
+"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 JPNIC 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 DAMAGES.
diff --git a/spdx-utils/src/main/resources/licenses/OFL-1.1 b/spdx-utils/src/main/resources/licenses/OFL-1.1
index 63b33c714432..34544f8b9853 100644
--- a/spdx-utils/src/main/resources/licenses/OFL-1.1
+++ b/spdx-utils/src/main/resources/licenses/OFL-1.1
@@ -1,6 +1,3 @@
-with Reserved Font Name
-with Reserved Font Name
-
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
diff --git a/spdx-utils/src/main/resources/licenses/bzip2-1.0.5 b/spdx-utils/src/main/resources/licenses/bzip2-1.0.5
index aa4c59c7d335..4bbb999e3369 100644
--- a/spdx-utils/src/main/resources/licenses/bzip2-1.0.5
+++ b/spdx-utils/src/main/resources/licenses/bzip2-1.0.5
@@ -1,35 +1,38 @@
-The bzip2 license
-Terms
-This program, "bzip2" and associated library "libbzip2", are
-copyright (C) Julian R Seward. All rights reserved.
+Version 1.0.5 of 10 December 2007
+
+Copyright © 1996-2007 Julian Seward
+
+This program, bzip2, the associated library libbzip2, and all documentation,
+are copyright © 1996-2007 Julian Seward. 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
+• Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
-2. The origin of this software must not be misrepresented; you must not claim
-that you wrote the original software. If you use this software in a product, an
-acknowledgment in the product documentation would be appreciated but is not
-required.
+• The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product,
+an acknowledgment in the product documentation would be appreciated but is
+not required.
-3. Altered source versions must be plainly marked as such, and must not be
+• Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
-4. The name of the author may not be used to endorse or promote products derived
+• The name of the author may not be used to endorse or promote products derived
from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-Julian Seward, Cambridge, UK.
-jseward@acm.org
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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
+AUTHOR 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.
+
+PATENTS: To the best of my knowledge, bzip2 and libbzip2 do not use any patented
+algorithms. However, I do not have the resources to carry out a patent search.
+Therefore I cannot give any guarantee of the above statement.
diff --git a/spdx-utils/src/main/resources/licenses/bzip2-1.0.6 b/spdx-utils/src/main/resources/licenses/bzip2-1.0.6
index d70618c4d68e..4a5a7457cbc6 100644
--- a/spdx-utils/src/main/resources/licenses/bzip2-1.0.6
+++ b/spdx-utils/src/main/resources/licenses/bzip2-1.0.6
@@ -1,25 +1,21 @@
-This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2010 Julian R Seward. 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.
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
- documentation would be appreciated but is not required.
+2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
+3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
+4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -32,6 +28,3 @@ 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.
-
-Julian Seward, jseward@bzip.org
-bzip2/libbzip2 version 1.0.6 of 6 September 2010
diff --git a/spdx-utils/src/main/resources/licenses/libpng-2.0 b/spdx-utils/src/main/resources/licenses/libpng-2.0
new file mode 100644
index 000000000000..6ccca8b798c1
--- /dev/null
+++ b/spdx-utils/src/main/resources/licenses/libpng-2.0
@@ -0,0 +1,34 @@
+PNG Reference Library License version 2 ---------------------------------------
+
+ * Copyright (c) 1995-2018 The PNG Reference Library Authors.
+
+ * Copyright (c) 2018 Cosmin Truta.
+
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+
+ * Copyright (c) 1996-1997 Andreas Dilger.
+
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind, express or
+implied, including, without limitation, the warranties of merchantability,
+fitness for a particular purpose, title, and non-infringement. In no even
+shall the Copyright owners, or anyone distributing the software, be liable
+for any damages or other liability, whether in contract, tort or otherwise,
+arising from, out of, or in connection with the software, or the use or other
+dealings in the software, even if advised of the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this software,
+or portions hereof, for any purpose, without fee, subject to the following
+restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product,
+an acknowledgment in the product documentation would be appreciated, but is
+not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+
+3. This Copyright notice may not be removed or altered from any source or
+altered source distribution.