CLDR-17110 update LICENSE SPDX, SPDX in other files

- does not regenerate dtds or xml - that will be done in future LDMLModify steps.
unicode-org · Feb 27, 2024 · ae6f2ce · ae6f2ce
1 parent f3e2a4b
commit ae6f2ce
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 18 deletions.
diff --git 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
diff --git a/docs/charts/keyboard/package.json b/docs/charts/keyboard/package.json
@@ -12,7 +12,7 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "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
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 	<licenses>
 		<license>
-			<name>Unicode-DFS-2016</name>
+			<name>Unicode-3.0</name>
 		</license>
 	</licenses>
 	<properties>

diff --git a/tools/cldr-apps/js/package-lock.json b/tools/cldr-apps/js/package-lock.json
diff --git a/tools/cldr-apps/js/package.json b/tools/cldr-apps/js/package.json
@@ -22,7 +22,7 @@
     "ui"
   ],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "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
@@ -111,7 +111,7 @@
 					<!--
 						exclude the "for-cldr" dependencies.
 						see https://unicode-org.atlassian.net/browse/ICU-21425
-						these are actually under Unicode-DFS-2016 the same as CLDR is.
+						these are actually under Unicode-3.0 the same as CLDR is.
 						The ICU license file itself is pulled in during assembly (into /LICENSE), which contains
 						all of ICU's third party license information.
 					-->

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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 	<licenses>
 		<license>
-			<name>Unicode-DFS-2016</name>
+			<name>Unicode-3.0</name>
 		</license>
 	</licenses>
 	<properties>

diff --git 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
diff --git a/tools/scripts/tr-archive/package.json b/tools/scripts/tr-archive/package.json
@@ -19,6 +19,6 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "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
@@ -9,7 +9,7 @@
   },
   "keywords": [],
   "author": "Steven R. Loomis <srl295@gmail.com>",
-  "license": "Unicode-DFS-2016",
+  "license": "Unicode-3.0",
   "dependencies": {
     "bent": "^7.3.10",
     "express": "^4.18.2",