From 427b895f0b7d0a35e9fdb6f9167bb78715ce5044 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Mon, 23 Oct 2023 12:57:59 -0500 Subject: [PATCH] CLDR-17137 json: fix LICENSE file - add a short -L option for the license-file option --- .../unicode/cldr/json/Ldml2JsonConverter.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 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 index ec5768807ff..1fca1b1eab9 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 @@ -1,20 +1,5 @@ package org.unicode.cldr.json; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; -import com.ibm.icu.number.IntegerWidth; -import com.ibm.icu.number.LocalizedNumberFormatter; -import com.ibm.icu.number.NumberFormatter; -import com.ibm.icu.number.Precision; -import com.ibm.icu.text.MessageFormat; -import com.ibm.icu.util.NoUnit; -import com.ibm.icu.util.ULocale; import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -38,6 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import org.unicode.cldr.draft.FileUtilities; import org.unicode.cldr.draft.ScriptMetadata; import org.unicode.cldr.draft.ScriptMetadata.Info; @@ -68,6 +54,22 @@ import org.unicode.cldr.util.XMLSource; import org.unicode.cldr.util.XPathParts; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import com.ibm.icu.number.IntegerWidth; +import com.ibm.icu.number.LocalizedNumberFormatter; +import com.ibm.icu.number.NumberFormatter; +import com.ibm.icu.number.Precision; +import com.ibm.icu.text.MessageFormat; +import com.ibm.icu.util.NoUnit; +import com.ibm.icu.util.ULocale; + /** * Utility methods to extract data from CLDR repository and export it in JSON format. * @@ -267,7 +269,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");