Skip to content

Commit

Permalink
spdx-utils: Upgrade the SPDX license list to version 3.14
Browse files Browse the repository at this point in the history
And upgrade the SPDX license text resources by running
"./gradlew :utils:spdx:generateSpdxEnums".

Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.io>
  • Loading branch information
mnonnenmacher committed Nov 5, 2021
1 parent a02dee9 commit 1535874
Show file tree
Hide file tree
Showing 16 changed files with 1,432 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ scancodeVersion = 3.2.1-rc2

# 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 = v3.13
spdxLicenseListVersion = v3.14
18 changes: 16 additions & 2 deletions utils/spdx/src/main/kotlin/SpdxLicense.kt
Original file line number Diff line number Diff line change
Expand Up @@ -121,30 +121,40 @@ enum class SpdxLicense(
CC_BY_1_0("CC-BY-1.0", "Creative Commons Attribution 1.0 Generic"),
CC_BY_2_0("CC-BY-2.0", "Creative Commons Attribution 2.0 Generic"),
CC_BY_2_5("CC-BY-2.5", "Creative Commons Attribution 2.5 Generic"),
CC_BY_2_5_AU("CC-BY-2.5-AU", "Creative Commons Attribution 2.5 Australia"),
CC_BY_3_0("CC-BY-3.0", "Creative Commons Attribution 3.0 Unported"),
CC_BY_3_0_AT("CC-BY-3.0-AT", "Creative Commons Attribution 3.0 Austria"),
CC_BY_3_0_DE("CC-BY-3.0-DE", "Creative Commons Attribution 3.0 Germany"),
CC_BY_3_0_NL("CC-BY-3.0-NL", "Creative Commons Attribution 3.0 Netherlands"),
CC_BY_3_0_US("CC-BY-3.0-US", "Creative Commons Attribution 3.0 United States"),
CC_BY_4_0("CC-BY-4.0", "Creative Commons Attribution 4.0 International"),
CC_BY_NC_1_0("CC-BY-NC-1.0", "Creative Commons Attribution Non Commercial 1.0 Generic"),
CC_BY_NC_2_0("CC-BY-NC-2.0", "Creative Commons Attribution Non Commercial 2.0 Generic"),
CC_BY_NC_2_5("CC-BY-NC-2.5", "Creative Commons Attribution Non Commercial 2.5 Generic"),
CC_BY_NC_3_0("CC-BY-NC-3.0", "Creative Commons Attribution Non Commercial 3.0 Unported"),
CC_BY_NC_3_0_DE("CC-BY-NC-3.0-DE", "Creative Commons Attribution Non Commercial 3.0 Germany"),
CC_BY_NC_4_0("CC-BY-NC-4.0", "Creative Commons Attribution Non Commercial 4.0 International"),
CC_BY_NC_ND_1_0("CC-BY-NC-ND-1.0", "Creative Commons Attribution Non Commercial No Derivatives 1.0 Generic"),
CC_BY_NC_ND_2_0("CC-BY-NC-ND-2.0", "Creative Commons Attribution Non Commercial No Derivatives 2.0 Generic"),
CC_BY_NC_ND_2_5("CC-BY-NC-ND-2.5", "Creative Commons Attribution Non Commercial No Derivatives 2.5 Generic"),
CC_BY_NC_ND_3_0("CC-BY-NC-ND-3.0", "Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported"),
CC_BY_NC_ND_3_0_DE("CC-BY-NC-ND-3.0-DE", "Creative Commons Attribution Non Commercial No Derivatives 3.0 Germany"),
CC_BY_NC_ND_3_0_IGO("CC-BY-NC-ND-3.0-IGO", "Creative Commons Attribution Non Commercial No Derivatives 3.0 IGO"),
CC_BY_NC_ND_4_0("CC-BY-NC-ND-4.0", "Creative Commons Attribution Non Commercial No Derivatives 4.0 International"),
CC_BY_NC_SA_1_0("CC-BY-NC-SA-1.0", "Creative Commons Attribution Non Commercial Share Alike 1.0 Generic"),
CC_BY_NC_SA_2_0("CC-BY-NC-SA-2.0", "Creative Commons Attribution Non Commercial Share Alike 2.0 Generic"),
CC_BY_NC_SA_2_0_FR("CC-BY-NC-SA-2.0-FR", "Creative Commons Attribution-NonCommercial-ShareAlike 2.0 France"),
CC_BY_NC_SA_2_0_UK("CC-BY-NC-SA-2.0-UK", "Creative Commons Attribution Non Commercial Share Alike 2.0 England and Wales"),
CC_BY_NC_SA_2_5("CC-BY-NC-SA-2.5", "Creative Commons Attribution Non Commercial Share Alike 2.5 Generic"),
CC_BY_NC_SA_3_0("CC-BY-NC-SA-3.0", "Creative Commons Attribution Non Commercial Share Alike 3.0 Unported"),
CC_BY_NC_SA_3_0_DE("CC-BY-NC-SA-3.0-DE", "Creative Commons Attribution Non Commercial Share Alike 3.0 Germany"),
CC_BY_NC_SA_3_0_IGO("CC-BY-NC-SA-3.0-IGO", "Creative Commons Attribution Non Commercial Share Alike 3.0 IGO"),
CC_BY_NC_SA_4_0("CC-BY-NC-SA-4.0", "Creative Commons Attribution Non Commercial Share Alike 4.0 International"),
CC_BY_ND_1_0("CC-BY-ND-1.0", "Creative Commons Attribution No Derivatives 1.0 Generic"),
CC_BY_ND_2_0("CC-BY-ND-2.0", "Creative Commons Attribution No Derivatives 2.0 Generic"),
CC_BY_ND_2_5("CC-BY-ND-2.5", "Creative Commons Attribution No Derivatives 2.5 Generic"),
CC_BY_ND_3_0("CC-BY-ND-3.0", "Creative Commons Attribution No Derivatives 3.0 Unported"),
CC_BY_ND_3_0_DE("CC-BY-ND-3.0-DE", "Creative Commons Attribution No Derivatives 3.0 Germany"),
CC_BY_ND_4_0("CC-BY-ND-4.0", "Creative Commons Attribution No Derivatives 4.0 International"),
CC_BY_SA_1_0("CC-BY-SA-1.0", "Creative Commons Attribution Share Alike 1.0 Generic"),
CC_BY_SA_2_0("CC-BY-SA-2.0", "Creative Commons Attribution Share Alike 2.0 Generic"),
Expand All @@ -153,11 +163,13 @@ enum class SpdxLicense(
CC_BY_SA_2_5("CC-BY-SA-2.5", "Creative Commons Attribution Share Alike 2.5 Generic"),
CC_BY_SA_3_0("CC-BY-SA-3.0", "Creative Commons Attribution Share Alike 3.0 Unported"),
CC_BY_SA_3_0_AT("CC-BY-SA-3.0-AT", "Creative Commons Attribution Share Alike 3.0 Austria"),
CC_BY_SA_3_0_DE("CC-BY-SA-3.0-DE", "Creative Commons Attribution Share Alike 3.0 Germany"),
CC_BY_SA_4_0("CC-BY-SA-4.0", "Creative Commons Attribution Share Alike 4.0 International"),
CC_PDDC("CC-PDDC", "Creative Commons Public Domain Dedication and Certification"),
CDDL_1_0("CDDL-1.0", "Common Development and Distribution License 1.0"),
CDDL_1_1("CDDL-1.1", "Common Development and Distribution License 1.1"),
CDLA_PERMISSIVE_1_0("CDLA-Permissive-1.0", "Community Data License Agreement Permissive 1.0"),
CDLA_PERMISSIVE_2_0("CDLA-Permissive-2.0", "Community Data License Agreement Permissive 2.0"),
CDLA_SHARING_1_0("CDLA-Sharing-1.0", "Community Data License Agreement Sharing 1.0"),
CDL_1_0("CDL-1.0", "Common Documentation License 1.0"),
CECILL_1_0("CECILL-1.0", "CeCILL Free Software License Agreement v1.0"),
Expand Down Expand Up @@ -356,7 +368,8 @@ enum class SpdxLicense(
NGPL("NGPL", "Nethack General Public License"),
NIST_PD("NIST-PD", "NIST Public Domain Notice"),
NIST_PD_FALLBACK("NIST-PD-fallback", "NIST Public Domain Notice with license fallback"),
NLOD_1_0("NLOD-1.0", "Norwegian Licence for Open Government Data"),
NLOD_1_0("NLOD-1.0", "Norwegian Licence for Open Government Data (NLOD) 1.0"),
NLOD_2_0("NLOD-2.0", "Norwegian Licence for Open Government Data (NLOD) 2.0"),
NLPL("NLPL", "No Limit Public License"),
NOKIA("Nokia", "Nokia Open Source License"),
NOSL("NOSL", "Netizen Open Source License"),
Expand Down Expand Up @@ -404,6 +417,7 @@ enum class SpdxLicense(
OML("OML", "Open Market License"),
OPENSSL("OpenSSL", "OpenSSL License"),
OPL_1_0("OPL-1.0", "Open Public License v1.0"),
OPUBL_1_0("OPUBL-1.0", "Open Publication License v1.0"),
OSET_PL_2_1("OSET-PL-2.1", "OSET Public License version 2.1"),
OSL_1_0("OSL-1.0", "Open Software License 1.0"),
OSL_1_1("OSL-1.1", "Open Software License 1.1"),
Expand Down Expand Up @@ -509,7 +523,7 @@ enum class SpdxLicense(
/**
* The version of the license list.
*/
const val LICENSE_LIST_VERSION = "3.13"
const val LICENSE_LIST_VERSION = "3.14"

/**
* Return the enum value for the given [id], or null if it is no SPDX license id.
Expand Down
Loading

0 comments on commit 1535874

Please sign in to comment.