CLDR-17137 v44: json: fix LICENSE file (#3357)

(cherry picked from commit 7dbac53)
unicode-org · Nov 1, 2023 · 1efc8f2 · 1efc8f2
1 parent 45d4cf7
commit 1efc8f2
Showing 1 changed file with 28 additions and 4 deletions.
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
@@ -42,8 +42,31 @@
 import org.unicode.cldr.draft.ScriptMetadata;
 import org.unicode.cldr.draft.ScriptMetadata.Info;
 import org.unicode.cldr.tool.Option.Options;
-import org.unicode.cldr.util.*;
+import org.unicode.cldr.util.Annotations;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CLDRFile.DraftStatus;
+import org.unicode.cldr.util.CLDRLocale;
+import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.CLDRTool;
+import org.unicode.cldr.util.CLDRURLS;
+import org.unicode.cldr.util.CalculatedCoverageLevels;
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.CoverageInfo;
+import org.unicode.cldr.util.DtdData;
+import org.unicode.cldr.util.DtdType;
+import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.FileCopier;
+import org.unicode.cldr.util.GlossonymConstructor;
+import org.unicode.cldr.util.Level;
+import org.unicode.cldr.util.LocaleIDParser;
+import org.unicode.cldr.util.Pair;
+import org.unicode.cldr.util.PatternCache;
+import org.unicode.cldr.util.StandardCodes;
+import org.unicode.cldr.util.SupplementalDataInfo;
+import org.unicode.cldr.util.Timer;
+import org.unicode.cldr.util.XMLSource;
+import org.unicode.cldr.util.XPathParts;
 
 /**
  * Utility methods to extract data from CLDR repository and export it in JSON format.
@@ -244,7 +267,7 @@ private class AvailableLocales {
                     // not be available as it is put in place by pom.xml
                     .add(
                             "license-file",
-                            null,
+                            'L',
                             ".*",
                             "",
                             "Override the license file included in the bundle");
@@ -1246,13 +1269,14 @@ public void writeReadme(String outputDir, String packageName) throws IOException
             writeReadmeSection(outf);
         }
         try (PrintWriter outf =
-                FileUtilities.openUTF8Writer(outputDir + "/" + packageName, "LICENSE"); ) {
+                FileUtilities.openUTF8Writer(
+                        outputDir + "/" + packageName, CldrUtility.LICENSE); ) {
             if (licenseFile.isPresent()) {
                 try (BufferedReader br = FileUtilities.openUTF8Reader("", licenseFile.get()); ) {
                     FileCopier.copy(br, outf);
                 }
             } else {
-                FileCopier.copy(CldrUtility.getUTF8Data("unicode-license.txt"), outf);
+                FileCopier.copy(CldrUtility.getUTF8Data(CldrUtility.LICENSE), outf);
             }
         }
     }