diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bb3bd7e7faf..91a73746483 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,7 +50,7 @@ begin with the accepted Jira ticket number.
### Licenses
-- Usage of CLDR data and software is governed by the Unicode [Terms of use][] a copy of which is included as [unicode-license.txt][]
+- Usage of CLDR data and software is governed by the Unicode [Terms of use][] a copy of which is included as [LICENSE][]
- Some CLDR tools depend on libraries in tools/cldr-code/libs/; use of these libraries is governed by separate license agreements.
- For example, use of the Guava, Xerces, and Myanmar Tools libraries is subject to the Apache License included as [apache-license.txt](./apache-license.txt)
- Use of the ICU libraries is subject to the ICU License, included as [ICU-LICENSE](./ICU-LICENSE).
diff --git a/unicode-license.txt b/LICENSE
similarity index 100%
rename from unicode-license.txt
rename to LICENSE
diff --git a/README.md b/README.md
index 002b56ada78..45a03a8ef01 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ For details about code and other contributions, see [CONTRIBUTING.md](./CONTRIBU
### Licenses
- Usage of CLDR data and software is governed by the [Unicode Terms of Use](https://www.unicode.org/copyright.html)
-a copy of which is included as [unicode-license.txt](./unicode-license.txt).
+a copy of which is included as [LICENSE](./LICENSE).
- Some CLDR tools depend on library dependencies managed via Maven,
use of these libraries is governed by separate license agreements.
diff --git a/readme.html b/readme.html
index 30f72ad7eb6..7aadce3286c 100644
--- a/readme.html
+++ b/readme.html
@@ -50,7 +50,7 @@
ReadMe for Unicode CLDR v
Licenses:
- Usage of CLDR data and software is governed by the Unicode Terms of Use,
- a copy of which is included as unicode-license.txt.
+ a copy of which is included as LICENSE.
- Some CLDR tools depend on libraries in tools/cldr-code/libs/; use of these libraries is governed by separate license agreements.
- Use of the ICU libraries is subject to the
diff --git a/tools/cldr-apps/README.md b/tools/cldr-apps/README.md
index 78ef53a77d9..cd9b951de85 100644
--- a/tools/cldr-apps/README.md
+++ b/tools/cldr-apps/README.md
@@ -95,7 +95,7 @@ CLDR_MAIL_DELAY_BATCH_ITEM=0
### Licenses
- Usage of CLDR data and software is governed by the [Unicode Terms of Use](https://www.unicode.org/copyright.html)
-a copy of which is included as [unicode-license.txt](../../unicode-license.txt).
+a copy of which is included as [LICENSE](../../LICENSE).
For more details, see the main [README.md](../../README.md).
diff --git a/tools/cldr-code/pom.xml b/tools/cldr-code/pom.xml
index 08594fffb1f..54e5c3204a7 100644
--- a/tools/cldr-code/pom.xml
+++ b/tools/cldr-code/pom.xml
@@ -65,9 +65,19 @@
${project.basedir}/../..
+
${project.build.directory}/classes/org/unicode/cldr/util/data
- unicode-license.txt
+ LICENSE
+
+
+
+ ${project.basedir}/../..
+
+
+ META-INF
+
+ LICENSE
@@ -91,7 +101,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.
- The ICU license file itself is pulled in during assembly, which contains
+ The ICU license file itself is pulled in during assembly (into /LICENSE), which contains
all of ICU's third party license information.
-->
.*-for-cldr.*
@@ -151,14 +161,13 @@
${scmBranch}
+
${project.basedir}/target/generated-sources/license/THIRD-PARTY.txt
CLDR-THIRD-PARTY.txt
-
- ${project.basedir}/../../unicode-license.txt
- unicode-license.txt
-
+
+
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
index 29a6ef3cde0..50ecf0bdcc3 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
@@ -985,11 +985,10 @@ public void writeReadme(String outputDir, String packageName) throws IOException
writeReadmeSection(outf);
}
try (PrintWriter outf = FileUtilities.openUTF8Writer(outputDir + "/" + packageName, "LICENSE");) {
- FileCopier.copy(CldrUtility.getUTF8Data("unicode-license.txt"), outf);
+ FileCopier.copy(CldrUtility.getUTF8Data(CldrUtility.LICENSE), outf);
}
}
-
String getBasePackageName(final String packageName) {
String basePackageName = packageName;
if (basePackageName.startsWith(CLDR_PKG_PREFIX)) {
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CldrUtility.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CldrUtility.java
index 5300f434627..13c546e6208 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CldrUtility.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CldrUtility.java
@@ -1020,6 +1020,11 @@ public static BufferedReader getUTF8Data(String name) {
return FileReaders.openFile(CldrUtility.class, "data/" + name);
}
+ /**
+ * License file
+ */
+ public static final String LICENSE = "LICENSE";
+
/**
* Fetch data from jar
*
@@ -1399,7 +1404,7 @@ public static String getCopyrightString() {
private static final class CopyrightHelper {
public static final CopyrightHelper INSTANCE = new CopyrightHelper();
- public final String COPYRIGHT_SHORT =
+ public final String COPYRIGHT_SHORT =
"Copyright \u00A9 1991-" + Calendar.getInstance().get(Calendar.YEAR) + " Unicode, Inc.";
}
@@ -1415,7 +1420,7 @@ public static String getCopyrightString(String linePrefix) {
* Returns the '## License' section in markdown.
*/
public static String getCopyrightMarkdown() {
- return "## License\n" +
+ return "## License\n" +
"\n" +
getCopyrightShort() + "\n" +
"[Terms of Use](http://www.unicode.org/copyright.html)\n\n" +
diff --git a/tools/st-prom-exporter/README.md b/tools/st-prom-exporter/README.md
index c3a78991943..de81dbaa951 100644
--- a/tools/st-prom-exporter/README.md
+++ b/tools/st-prom-exporter/README.md
@@ -114,4 +114,4 @@ And here is an alert rule to make sure the exporter itself is up.
For license and copyright see
https://www.unicode.org/copyright.html
-or [../../unicode-license.txt](../../unicode-license.txt)
\ No newline at end of file
+or [../../LICENSE](../../LICENSE)