Skip to content

Commit

Permalink
deps(spdx-utils): Update the SPDX license list version to 3.25.0
Browse files Browse the repository at this point in the history
Done by running [1].

[1] `./gradlew --no-configuration-cache generateSpdxEnums`

Signed-off-by: Frank Viernau <frank_viernau@epam.com>
  • Loading branch information
fviernau committed Aug 26, 2024
1 parent 7ecf85d commit f87f923
Show file tree
Hide file tree
Showing 28 changed files with 296 additions and 90 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ javaLanguageVersion = 11

# The version of the SPDX license list which is used to import license texts and generate SPDX enums. Must be a valid
# tag, see https://github.com/spdx/license-list-data/tags.
spdxLicenseListVersion = 3.24.0
spdxLicenseListVersion = 3.25.0
11 changes: 9 additions & 2 deletions utils/spdx/src/main/kotlin/SpdxLicense.kt
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ enum class SpdxLicense(
DL_DE_BY_2_0("DL-DE-BY-2.0", "Data licence Germany – attribution – version 2.0"),
DL_DE_ZERO_2_0("DL-DE-ZERO-2.0", "Data licence Germany – zero – version 2.0"),
DOC("DOC", "DOC License"),
DOCBOOK_SCHEMA("DocBook-Schema", "DocBook Schema License"),
DOCBOOK_XML("DocBook-XML", "DocBook XML License"),
DOTSEQN("Dotseqn", "Dotseqn License"),
DRL_1_0("DRL-1.0", "Detection Rule License 1.0"),
DRL_1_1("DRL-1.1", "Detection Rule License 1.1"),
Expand Down Expand Up @@ -346,6 +348,7 @@ enum class SpdxLicense(
GUTMANN("Gutmann", "Gutmann License"),
HASKELLREPORT("HaskellReport", "Haskell Language Report License"),
HDPARM("hdparm", "hdparm License"),
HIDAPI("HIDAPI", "HIDAPI License"),
HIPPOCRATIC_2_1("Hippocratic-2.1", "Hippocratic License 2.1"),
HPND("HPND", "Historical Permission Notice and Disclaimer"),
HPND_DEC("HPND-DEC", "Historical Permission Notice and Disclaimer - DEC variant"),
Expand All @@ -362,6 +365,7 @@ enum class SpdxLicense(
HPND_MARKUS_KUHN("HPND-Markus-Kuhn", "Historical Permission Notice and Disclaimer - Markus Kuhn variant"),
HPND_MERCHANTABILITY_VARIANT("HPND-merchantability-variant", "Historical Permission Notice and Disclaimer - merchantability variant"),
HPND_MIT_DISCLAIMER("HPND-MIT-disclaimer", "Historical Permission Notice and Disclaimer with MIT disclaimer"),
HPND_NETREK("HPND-Netrek", "Historical Permission Notice and Disclaimer - Netrek variant"),
HPND_PBMPLUS("HPND-Pbmplus", "Historical Permission Notice and Disclaimer - Pbmplus variant"),
HPND_SELL_MIT_DISCLAIMER_XSERVER("HPND-sell-MIT-disclaimer-xserver", "Historical Permission Notice and Disclaimer - sell xserver variant with MIT disclaimer"),
HPND_SELL_REGEXPR("HPND-sell-regexpr", "Historical Permission Notice and Disclaimer - sell regexpr variant"),
Expand Down Expand Up @@ -492,7 +496,7 @@ enum class SpdxLicense(
NCL("NCL", "NCL Source Code License"),
NCSA("NCSA", "University of Illinois/NCSA Open Source License"),
NETCDF("NetCDF", "NetCDF license"),
NET_SNMP("Net-SNMP", "Net-SNMP License"),
NET_SNMP("Net-SNMP", "Net-SNMP License", true),
NEWSLETR("Newsletr", "Newsletr License"),
NGPL("NGPL", "Nethack General Public License"),
NICTA_1_0("NICTA-1.0", "NICTA Public Software License, Version 1.0"),
Expand Down Expand Up @@ -595,6 +599,7 @@ enum class SpdxLicense(
RSA_MD("RSA-MD", "RSA Message-Digest License"),
RSCPL("RSCPL", "Ricoh Source Code Public License"),
RUBY("Ruby", "Ruby License"),
RUBY_PTY("Ruby-pty", "Ruby pty extension license"),
SAXPATH("Saxpath", "Saxpath License"),
SAX_PD("SAX-PD", "Sax Public Domain Notice"),
SAX_PD_2_0("SAX-PD-2.0", "Sax Public Domain Notice 2.0"),
Expand Down Expand Up @@ -652,6 +657,7 @@ enum class SpdxLicense(
TTYP0("TTYP0", "TTYP0 License"),
TU_BERLIN_1_0("TU-Berlin-1.0", "Technische Universitaet Berlin License 1.0"),
TU_BERLIN_2_0("TU-Berlin-2.0", "Technische Universitaet Berlin License 2.0"),
UBUNTU_FONT_1_0("Ubuntu-font-1.0", "Ubuntu Font Licence v1.0"),
UCAR("UCAR", "UCAR License"),
UCL_1_0("UCL-1.0", "Upstream Compatibility License v1.0"),
ULEM("ulem", "ulem License"),
Expand All @@ -678,6 +684,7 @@ enum class SpdxLicense(
WXWINDOWS("wxWindows", "wxWindows Library License", true),
X11("X11", "X11 License"),
X11_DISTRIBUTE_MODIFICATIONS_VARIANT("X11-distribute-modifications-variant", "X11 License Distribution Modification Variant"),
X11_SWAPPED("X11-swapped", "X11 swapped final paragraphs"),
XDEBUG_1_03("Xdebug-1.03", "Xdebug License v 1.03"),
XEROX("Xerox", "Xerox License"),
XFIG("Xfig", "Xfig License"),
Expand Down Expand Up @@ -708,7 +715,7 @@ enum class SpdxLicense(
/**
* The version of the license list.
*/
const val LICENSE_LIST_VERSION = "3.24.0"
const val LICENSE_LIST_VERSION = "3.25.0"

/**
* Return the enum value for the given [id], or null if it is no SPDX license id.
Expand Down
2 changes: 2 additions & 0 deletions utils/spdx/src/main/kotlin/SpdxLicenseException.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ enum class SpdxLicenseException(
CRYPTSETUP_OPENSSL_EXCEPTION("cryptsetup-OpenSSL-exception", "cryptsetup OpenSSL exception"),
DIGIRULE_FOSS_EXCEPTION("DigiRule-FOSS-exception", "DigiRule FOSS License Exception"),
ECOS_EXCEPTION_2_0("eCos-exception-2.0", "eCos exception 2.0"),
ERLANG_OTP_LINKING_EXCEPTION("erlang-otp-linking-exception", "Erlang/OTP Linking Exception"),
FAWKES_RUNTIME_EXCEPTION("Fawkes-Runtime-exception", "Fawkes Runtime Exception"),
FLTK_EXCEPTION("FLTK-exception", "FLTK exception"),
FMT_EXCEPTION("fmt-exception", "fmt exception"),
Expand Down Expand Up @@ -100,6 +101,7 @@ enum class SpdxLicenseException(
QT_GPL_EXCEPTION_1_0("Qt-GPL-exception-1.0", "Qt GPL exception 1.0"),
QT_LGPL_EXCEPTION_1_1("Qt-LGPL-exception-1.1", "Qt LGPL exception 1.1"),
QWT_EXCEPTION_1_0("Qwt-exception-1.0", "Qwt exception 1.0"),
ROMIC_EXCEPTION("romic-exception", "Romic Exception"),
RRDTOOL_FLOSS_EXCEPTION_2_0("RRDtool-FLOSS-exception-2.0", "RRDtool FLOSS exception 2.0"),
SANE_EXCEPTION("SANE-exception", "SANE Exception"),
SHL_2_0("SHL-2.0", "Solderpad Hardware License v2.0"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
If you modify this Program, or any covered work, by linking or
combining it with runtime libraries of Erlang/OTP as released by
Ericsson on https://www.erlang.org (or a modified version of these
libraries), containing parts covered by the terms of the Erlang Public
License (https://www.erlang.org/EPLICENSE), the licensors of this
Program grant you additional permission to convey the resulting work
without the need to license the runtime libraries of Erlang/OTP under
the GNU Affero General Public License. Corresponding Source for a
non-source form of such a combination shall include the source code
for the parts of the runtime libraries of Erlang/OTP used as well as
that of the covered work.
6 changes: 6 additions & 0 deletions utils/spdx/src/main/resources/exceptions/romic-exception
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Additional permission under the GNU Affero GPL version 3 section 7:

If you modify this Program, or any covered work, by linking or
combining it with other code, such other code is not for that reason
alone subject to any of the requirements of the GNU Affero GPL
version 3.
4 changes: 2 additions & 2 deletions utils/spdx/src/main/resources/licenses/3D-Slicer-1.0
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Sublicense ("Contribution Agreement").
your breach of any of the terms of this Agreement.

6. YOU WARRANT THAT TO THE BEST OF YOUR KNOWLEDGE YOUR CONTRIBUTION
DOES NOT CONTAIN ANY CODE THAT REQUIRES OR PRESCRIBES AN "OPEN
DOES NOT CONTAIN ANY CODE THAT REQURES OR PRESCRIBES AN "OPEN
SOURCE LICENSE" FOR DERIVATIVE WORKS (by way of non-limiting
example, the GNU General Public License or other so-called
"reciprocal" license that requires any derived work to be licensed
Expand All @@ -84,7 +84,7 @@ Sublicense ("Software License").
downloading and/or using, reproducing, modifying, displaying and/or
distributing the Software and the institution or entity which
employs or is otherwise affiliated with such individual in
connection therewith. The Brigham and Women's Hospital,
connection therewith. The Brigham and Women?s Hospital,
Inc. ("Brigham") hereby grants you, with right to sublicense, with
respect to Brigham's rights in the software, and data, if any,
which is the subject of this Software License (collectively, the
Expand Down
2 changes: 0 additions & 2 deletions utils/spdx/src/main/resources/licenses/AMD-newlib
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright 1989, 1990 Advanced Micro Devices, Inc.

This software is the property of Advanced Micro Devices, Inc (AMD) which
specifically grants the user the right to modify, use and distribute this
software provided this notice is not removed or altered. All other rights
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
Copyright (C) 2006,2007,2009 NTT (Nippon Telegraph and Telephone
Corporation). All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Expand Down
9 changes: 2 additions & 7 deletions utils/spdx/src/main/resources/licenses/Catharon
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
The Catharon Open Source LICENSE
----------------------------

2000-Jul-04

Copyright (C) 2000 by Catharon Productions, Inc.

The Catharon Open Source LICENSE

2000-Jul-04

Introduction
============
Expand Down
22 changes: 22 additions & 0 deletions utils/spdx/src/main/resources/licenses/DocBook-Schema
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright 1992-2011 HaL Computer Systems, Inc.,
O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
Corporation, Norman Walsh, Sun Microsystems, Inc., and the
Organization for the Advancement of Structured Information
Standards (OASIS).

Permission to use, copy, modify and distribute the DocBook schema
and its accompanying documentation for any purpose and without fee
is hereby granted in perpetuity, provided that the above copyright
notice and this paragraph appear in all copies. The copyright
holders make no representation about the suitability of the schema
for any purpose. It is provided "as is" without expressed or implied
warranty.

If you modify the DocBook schema in any way, label your schema as a
variant of DocBook. See the reference documentation
(http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook)
for more information.

Please direct all questions, bug reports, or suggestions for changes
to the docbook@lists.oasis-open.org mailing list. For more
information, see http://www.oasis-open.org/docbook/.
48 changes: 48 additions & 0 deletions utils/spdx/src/main/resources/licenses/DocBook-XML
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
Copyright
---------
Copyright (C) 1999-2007 Norman Walsh
Copyright (C) 2003 Jiří Kosek
Copyright (C) 2004-2007 Steve Ball
Copyright (C) 2005-2014 The DocBook Project
Copyright (C) 2011-2012 O'Reilly Media

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the ``Software''), to deal in 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:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

Except as contained in this notice, the names of individuals
credited with contribution to this software shall not be used in
advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization
from the individuals in question.

Any stylesheet derived from this Software that is publically
distributed will be identified with a different name and the
version strings in any derived Software will be changed so that
no possibility of confusion between the derived package and this
Software will exist.

Warranty
--------
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 NORMAN WALSH OR ANY OTHER
CONTRIBUTOR 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 IN THE SOFTWARE.

Contacting the Author
---------------------
The DocBook XSL stylesheets are maintained by Norman Walsh,
<ndw@nwalsh.com>, and members of the DocBook Project,
<docbook-developers@sf.net>
2 changes: 2 additions & 0 deletions utils/spdx/src/main/resources/licenses/HIDAPI
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This software may be used by anyone for any reason so long
as the copyright notice in the source files remains intact.
2 changes: 0 additions & 2 deletions utils/spdx/src/main/resources/licenses/HPND-Intel
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (c) 1993 Intel Corporation

Intel hereby grants you permission to copy, modify, and distribute this
software and its documentation. Intel grants this permission provided
that the above copyright notice appears in all copies and that both the
Expand Down
10 changes: 10 additions & 0 deletions utils/spdx/src/main/resources/licenses/HPND-Netrek
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Copyright (C) 1995 S. M. Patel (smpatel@wam.umd.edu)

Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation. No representations are made about the
suitability of this software for any purpose. It is
provided "as is" without express or implied warranty.
2 changes: 0 additions & 2 deletions utils/spdx/src/main/resources/licenses/HPND-UC-export-US
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (C) 1985, 1990 Regents of the University of California.

Permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without
fee is hereby granted, provided that the above copyright
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Copyright (C) 1994 by the University of Southern California

EXPORT OF THIS SOFTWARE from the United States of America may
require a specific license from the United States Government. It
is the responsibility of any person or organization
contemplating export to obtain such a license before exporting.
EXPORT OF THIS SOFTWARE from the United States of America may
require a specific license from the United States Government. It
is the responsibility of any person or organization
contemplating export to obtain such a license before exporting.

WITHIN THAT CONSTRAINT, permission to copy, modify, and distribute
this software and its documentation in source and binary forms is
Expand Down
35 changes: 16 additions & 19 deletions utils/spdx/src/main/resources/licenses/HPND-export2-US
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
Copyright 2004-2008 Apple Inc. All Rights Reserved.
Export of this software from the United States of America may require a specific
license from the United States Government. It is the responsibility of any
person or organization contemplating export to obtain such a license before
exporting.

Export of this software from the United States of America may
require a specific license from the United States Government.
It is the responsibility of any person or organization
contemplating export to obtain such a license before exporting.
WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute this
software and its documentation for any purpose and without fee is hereby
granted, provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in supporting
documentation, and that the name of The author not be used in advertising or
publicity pertaining to distribution of the software without specific, written
prior permission. The author makes no representations about the suitability of
this software for any purpose. It is provided "as is" without express or
implied warranty.

WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
distribute this software and its documentation for any purpose and
without fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright notice and
this permission notice appear in supporting documentation, and that
the name of Apple Inc. not be used in advertising or publicity
pertaining to distribution of the software without specific,
written prior permission. Apple Inc. makes no representations
about the suitability of this software for any purpose. It is
provided "as is" without express or implied warranty.

THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (C) 2004 Christian Groessler <chris@groessler.org>

Permission to use, copy, modify, and distribute this file
for any purpose is hereby granted without fee, provided that
the above copyright notice and this notice appears in all
Expand Down
2 changes: 0 additions & 2 deletions utils/spdx/src/main/resources/licenses/MIT-Khronos-old
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Copyright (c) 2014-2020 The Khronos Group Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and/or associated documentation files (the "Materials"),
to deal in the Materials without restriction, including without limitation
Expand Down
5 changes: 3 additions & 2 deletions utils/spdx/src/main/resources/licenses/NCBI-PD
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
PUBLIC DOMAIN NOTICE
National Center for Biotechnology Information

This software is a "United States Government Work" under the terms of the
With the exception of certain third-party files summarized below, this
software is a "United States Government Work" under the terms of the
United States Copyright Act. It was written as part of the authors'
official duties as United States Government employees and thus cannot
be copyrighted. This software is freely available to the public for
Expand All @@ -16,4 +17,4 @@ Government disclaim all warranties, express or implied, including
warranties of performance, merchantability or fitness for any
particular purpose.

Please cite the author in any work or product based on this material.
Please cite the authors in any work or product based on this material.
46 changes: 21 additions & 25 deletions utils/spdx/src/main/resources/licenses/NCL
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
Copyright (c) 2004 the University Corporation for Atmospheric
Research ("UCAR"). All rights reserved. Developed by NCAR's
Computational and Information Systems Laboratory, UCAR,
www.cisl.ucar.edu.

FFTPACK license:
Redistribution and use of the Software in source and binary forms,
with or without modification, is permitted provided that the
following conditions are met:

- Neither the names of NCAR's Computational and Information Systems
Laboratory, the University Corporation for Atmospheric Research,
nor the names of its sponsors or contributors may be used to
endorse or promote products derived from this Software without
specific prior written permission.
- Neither the names of NCAR's Computational and Information Systems
Laboratory, the University Corporation for Atmospheric Research,
nor the names of its sponsors or contributors may be used to
endorse or promote products derived from this Software without
specific prior written permission.

- Redistributions of source code must retain the above copyright
notices, this list of conditions, and the disclaimer below.
- Redistributions of source code must retain the above copyright
notices, this list of conditions, and the disclaimer below.

- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions, and the disclaimer below in the
documentation and/or other materials provided with the
distribution.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions, and the disclaimer below in the
documentation and/or other materials provided with the
distribution.

THIS 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, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL 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.
THIS 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, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL 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.
3 changes: 0 additions & 3 deletions utils/spdx/src/main/resources/licenses/OAR
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
COPYRIGHT (c) 1989-2013, 2015.
On-Line Applications Research Corporation (OAR).

Permission to use, copy, modify, and distribute this software for any
purpose without fee is hereby granted, provided that this entire notice
is included in all copies of any software which is or includes a copy
Expand Down
Loading

0 comments on commit f87f923

Please sign in to comment.