From 81d745513d40879c589d2ed5d7d5c2ca4b046582 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 26 Feb 2024 10:50:33 -0600 Subject: [PATCH] CLDR-17110 update LICENSE SPDX, SPDX in other files - does not regenerate dtds or xml - that will be done in future LDMLModify steps. --- LICENSE | 2 ++ docs/charts/keyboard/package-lock.json | 2 +- docs/charts/keyboard/package.json | 2 +- pom.xml | 2 +- tools/cldr-apps/js/package-lock.json | 2 +- tools/cldr-apps/js/package.json | 2 +- tools/cldr-code/pom.xml | 2 +- .../unicode/cldr/tool/GeneratePersonNameTestData.java | 9 +++------ .../src/main/java/org/unicode/cldr/util/CLDRURLS.java | 2 +- tools/pom.xml | 2 +- tools/scripts/ansible/roles/openliberty/meta/main.yml | 2 +- tools/scripts/tr-archive/package-lock.json | 2 +- tools/scripts/tr-archive/package.json | 2 +- tools/st-prom-exporter/package.json | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-) diff --git a/LICENSE b/LICENSE index 7dd35b154e1..a82da826331 100644 --- a/LICENSE +++ b/LICENSE @@ -37,3 +37,5 @@ Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. + +SPDX-License-Identifier: Unicode-3.0 diff --git a/docs/charts/keyboard/package-lock.json b/docs/charts/keyboard/package-lock.json index 4321cadf3a8..2cafa9454c6 100644 --- a/docs/charts/keyboard/package-lock.json +++ b/docs/charts/keyboard/package-lock.json @@ -8,7 +8,7 @@ "name": "@unicode-org/keyboard-charts", "version": "1.0.0", "hasInstallScript": true, - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "dependencies": { "fast-xml-parser": "^4.2.5" } diff --git a/docs/charts/keyboard/package.json b/docs/charts/keyboard/package.json index 06bf42abbe2..69c1ecc396d 100644 --- a/docs/charts/keyboard/package.json +++ b/docs/charts/keyboard/package.json @@ -12,7 +12,7 @@ }, "keywords": [], "author": "Steven R. Loomis ", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "bugs": { "url": "https://github.com/unicode-org/cldr/issues" }, diff --git a/pom.xml b/pom.xml index 0c0c4323bbb..0af8401f2d0 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ pom - Unicode-DFS-2016 + Unicode-3.0 diff --git a/tools/cldr-apps/js/package-lock.json b/tools/cldr-apps/js/package-lock.json index cd8053554d5..0422d061243 100644 --- a/tools/cldr-apps/js/package-lock.json +++ b/tools/cldr-apps/js/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "cldr-apps-js", "version": "1.0.0", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "dependencies": { "@datadog/browser-logs": "^5.4.0", "@datadog/browser-rum": "^5.4.0", diff --git a/tools/cldr-apps/js/package.json b/tools/cldr-apps/js/package.json index 16c6ad5374a..e6869cf6cde 100644 --- a/tools/cldr-apps/js/package.json +++ b/tools/cldr-apps/js/package.json @@ -22,7 +22,7 @@ "ui" ], "author": "Steven R. Loomis ", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "bugs": { "url": "https://github.com/unicode-org/cldr/issues" }, diff --git a/tools/cldr-code/pom.xml b/tools/cldr-code/pom.xml index 1f617861a09..e0801dbbf58 100644 --- a/tools/cldr-code/pom.xml +++ b/tools/cldr-code/pom.xml @@ -111,7 +111,7 @@ diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java index 32955055b10..6f9ead94cfb 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GeneratePersonNameTestData.java @@ -21,6 +21,7 @@ import org.unicode.cldr.util.CLDRFile; import org.unicode.cldr.util.CLDRFile.DraftStatus; import org.unicode.cldr.util.CLDRPaths; +import org.unicode.cldr.util.CldrUtility; import org.unicode.cldr.util.Factory; import org.unicode.cldr.util.TempPrintWriter; import org.unicode.cldr.util.personname.PersonNameFormatter; @@ -244,12 +245,8 @@ public static void main(String[] args) { try (TempPrintWriter output2 = TempPrintWriter.openUTF8Writer(dir.toString(), locale + ".txt"); ) { output2.write( - "# Test data for unit conversions" - + "\n# Copyright © 1991-2023 Unicode, Inc." - + "\n# For terms of use, see http://www.unicode.org/copyright.html" - + "\n# SPDX-License-Identifier: Unicode-DFS-2016" - + "\n# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)" - + "\n#" + "# Test data for Person Name Data" + + CldrUtility.getCopyrightString("# ") + "\n# CLDR person name formatting test data for: " + locale + "\n#" diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java index fc94139ec89..d4dcc751812 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java @@ -25,7 +25,7 @@ public abstract class CLDRURLS { public static final String UNICODE_CONSORTIUM = "The Unicode Consortium"; public static final String CLDR_UPDATINGDTD_URL = CLDR_HOMEPAGE + "/development/updating-dtds"; /** Our license, in SPDX format */ - public static final String UNICODE_SPDX = "Unicode-DFS-2016"; + public static final String UNICODE_SPDX = "Unicode-3.0"; /** * See: * https://spdx.github.io/spdx-spec/appendix-V-using-SPDX-short-identifiers-in-source-files/ diff --git a/tools/pom.xml b/tools/pom.xml index 216cdd8c183..7ee2395847f 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ pom - Unicode-DFS-2016 + Unicode-3.0 diff --git a/tools/scripts/ansible/roles/openliberty/meta/main.yml b/tools/scripts/ansible/roles/openliberty/meta/main.yml index 98f1d3bf94e..06ae2979bc3 100644 --- a/tools/scripts/ansible/roles/openliberty/meta/main.yml +++ b/tools/scripts/ansible/roles/openliberty/meta/main.yml @@ -2,7 +2,7 @@ galaxy_info: author: Steven R. Loomis description: Ubuntu installer for OpenLiberty - license: Unicode-DFS-2016 + license: Unicode-3.0 min_ansible_version: "2.1" diff --git a/tools/scripts/tr-archive/package-lock.json b/tools/scripts/tr-archive/package-lock.json index 92dca05f37d..6b276c7f007 100644 --- a/tools/scripts/tr-archive/package-lock.json +++ b/tools/scripts/tr-archive/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "tr-archive", "version": "1.0.0", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "dependencies": { "@not-dalia/gfm-toc": "github:not-dalia/gfm-toc", "anchor-js": "^5.0.0", diff --git a/tools/scripts/tr-archive/package.json b/tools/scripts/tr-archive/package.json index fb01a35443b..496632a3731 100644 --- a/tools/scripts/tr-archive/package.json +++ b/tools/scripts/tr-archive/package.json @@ -19,6 +19,6 @@ }, "keywords": [], "author": "Steven R. Loomis ", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "private": true } diff --git a/tools/st-prom-exporter/package.json b/tools/st-prom-exporter/package.json index d6103f1c1b6..4e95cf2040c 100644 --- a/tools/st-prom-exporter/package.json +++ b/tools/st-prom-exporter/package.json @@ -9,7 +9,7 @@ }, "keywords": [], "author": "Steven R. Loomis ", - "license": "Unicode-DFS-2016", + "license": "Unicode-3.0", "dependencies": { "bent": "^7.3.10", "express": "^4.18.2",