Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17110 update LICENSE SPDX, SPDX in other files #3525

Merged
merged 1 commit into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/charts/keyboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/charts/keyboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>pom</packaging>
<licenses>
<license>
<name>Unicode-DFS-2016</name>
<name>Unicode-3.0</name>
</license>
</licenses>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-apps/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/cldr-apps/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-code/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

+ "\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#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>pom</packaging>
<licenses>
<license>
<name>Unicode-DFS-2016</name>
<name>Unicode-3.0</name>
</license>
</licenses>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/ansible/roles/openliberty/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/tr-archive/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/scripts/tr-archive/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
},
"keywords": [],
"author": "Steven R. Loomis <srl295@gmail.com>",
"license": "Unicode-DFS-2016",
"license": "Unicode-3.0",
"private": true
}
2 changes: 1 addition & 1 deletion tools/st-prom-exporter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading