CLDR-16466 move unicode-license.txt to LICENSE

- this is the standard name for this file, gets prominent display on github.com etc.
- fixup some issues with the LICENSE file's inclusion in the cldr-code jar

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).

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.

readme.html

@@ -50,7 +50,7 @@ <h3>ReadMe for Unicode <abbr title="Common Locale Data Repository">CLDR</abbr> v
     <p>Licenses:</p>
     <ul>
  	  <li>Usage of CLDR data and software is governed by the <a href="http://www.unicode.org/copyright.html">Unicode Terms of Use</a>,
- 	    a copy of which is included as unicode-license.txt.</li>
+ 	    a copy of which is included as LICENSE.</li>
  	  <li>Some CLDR tools depend on libraries in tools/cldr-code/libs/; use of these libraries is governed by separate license agreements.
  	  <ul>
  	    <li>Use of the ICU libraries is subject to the

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).
 

tools/cldr-code/pom.xml

@@ -65,9 +65,19 @@
 			</resource>
 			<resource>
 		       <directory>${project.basedir}/../..</directory>
+			   <!-- This is put here so that it can be read by CldrUtility, even outside of a jar -->
 		       <targetPath>${project.build.directory}/classes/org/unicode/cldr/util/data</targetPath>
 				<includes>
-					<include>unicode-license.txt</include>
+					<include>LICENSE</include>
+				</includes>
+			</resource>
+			<resource>
+		       <directory>${project.basedir}/../..</directory>
+			   <!-- This is put here so that it shows up in the final .jar in an expected spot -->
+			   <!-- Note: icu4j keeps its license file at the root, /LICENSE. We won't conflict. -->
+		       <targetPath>META-INF</targetPath>
+				<includes>
+					<include>LICENSE</include>
 				</includes>
 			</resource>
 		</resources>
@@ -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.
 					-->
 					<excludedArtifacts>.*-for-cldr.*</excludedArtifacts>
@@ -151,14 +161,13 @@
 										<CLDR-Code-Git-Branch>${scmBranch}</CLDR-Code-Git-Branch>
 									</manifestEntries>
 								</transformer>
+								<!-- this will have any other found licenses included -->
 								<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
 									<file>${project.basedir}/target/generated-sources/license/THIRD-PARTY.txt</file>
 									<resource>CLDR-THIRD-PARTY.txt</resource>
 								</transformer>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-									<file>${project.basedir}/../../unicode-license.txt</file>
-									<resource>unicode-license.txt</resource>
-								</transformer>
+								<!-- prevent any possible duplication of LICENSE files -->
+								<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
 							</transformers>
 						</configuration>
 					</execution>

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)) {

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" +

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)
+or [../../LICENSE](../../LICENSE)