Merge remote-tracking branch 'la-vache/main' into jurchen

Author: eggrobin

.github/workflows/cache_retain.yml

@@ -30,6 +30,10 @@ jobs:
   retain-maven-cache:
     name: Run all tests with Maven
     runs-on: ubuntu-latest
+    # Only run this on the upstream repo. Otherwise, running in a personal fork will cause
+    # Github to disable the personal fork copy of the workflow
+    # (Github complains about running a scheduled workflow on a repo with > 60 days of inactivity)
+    if: github.ref == 'refs/heads/main' && github.repository == 'unicode-org/unicodetools'
     steps:
       - name: Checkout and setup
         uses: actions/checkout@v2

UnicodeJsps/pom.xml

@@ -31,11 +31,6 @@
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>com.ibm.icu</groupId>
-			<artifactId>utilities-for-cldr</artifactId>
-		</dependency>
 		<!-- cldr -->
 		<dependency>
 			<groupId>org.unicode.cldr</groupId>

UnicodeJsps/src/main/java/org/unicode/jsp/Annotations.java

@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.UnicodeSet;
 import java.util.Collections;

UnicodeJsps/src/main/java/org/unicode/jsp/BidiCharMap.java

@@ -1,7 +1,7 @@
 /** */
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.UnicodeSet;

UnicodeJsps/src/main/java/org/unicode/jsp/Confusables.java

@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.text.Normalizer;
 import com.ibm.icu.text.Normalizer.Mode;

UnicodeJsps/src/main/java/org/unicode/jsp/CreateInversions.java

@@ -1,7 +1,7 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
-import com.ibm.icu.dev.util.UnicodeMapIterator;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMapIterator;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.text.UnicodeSetIterator;

UnicodeJsps/src/main/java/org/unicode/jsp/NFM.java

@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import java.util.regex.Pattern;
 

UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester.java

@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;

UnicodeJsps/src/main/java/org/unicode/jsp/ScriptTester2.java

@@ -4,7 +4,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.Normalizer2;

UnicodeJsps/src/main/java/org/unicode/jsp/SequenceData.java

@@ -1,6 +1,6 @@
 package org.unicode.jsp;
 
-import com.ibm.icu.dev.util.UnicodeMap;
+import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.UnicodeSet;