[GR-46899] Switch Python to shaded ICU4J module.

PullRequest: graalpython/2846

Author: woess

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/sst/StringLiteralUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -48,7 +48,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import com.ibm.icu.lang.UCharacter;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacter;
 import com.oracle.graal.python.pegparser.ErrorCallback;
 import com.oracle.graal.python.pegparser.ErrorCallback.WarningType;
 import com.oracle.graal.python.pegparser.FExprParser;

graalpython/com.oracle.graal.python.pegparser/src/com/oracle/graal/python/pegparser/tokenizer/Tokenizer.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2021, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2021 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -13,8 +13,8 @@
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.lang.UProperty;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacter;
+import org.graalvm.shadowed.com.ibm.icu.lang.UProperty;
 import com.oracle.graal.python.pegparser.ErrorCallback;
 import com.oracle.graal.python.pegparser.ErrorCallback.WarningType;
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/UnicodeDataModuleBuiltins.java

@@ -46,8 +46,8 @@
 import java.text.Normalizer;
 import java.util.List;
 
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.lang.UProperty;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacter;
+import org.graalvm.shadowed.com.ibm.icu.lang.UProperty;
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -53,8 +53,8 @@
 
 import java.io.IOException;
 
-import com.ibm.icu.impl.Punycode;
-import com.ibm.icu.text.StringPrepParseException;
+import org.graalvm.shadowed.com.ibm.icu.impl.Punycode;
+import org.graalvm.shadowed.com.ibm.icu.text.StringPrepParseException;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ApiInitException;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -78,9 +78,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.lang.UProperty;
-import com.ibm.icu.text.CaseMap;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacter;
+import org.graalvm.shadowed.com.ibm.icu.lang.UProperty;
+import org.graalvm.shadowed.com.ibm.icu.text.CaseMap;
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java

@@ -50,9 +50,9 @@
 
 import org.graalvm.nativeimage.ImageInfo;
 
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.lang.UCharacterCategory;
-import com.ibm.icu.lang.UProperty;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacter;
+import org.graalvm.shadowed.com.ibm.icu.lang.UCharacterCategory;
+import org.graalvm.shadowed.com.ibm.icu.lang.UProperty;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/reflect-config.json

@@ -1,56 +1,4 @@
 [
-{
-  "name":"com.ibm.icu.impl.ICUCurrencyDisplayInfoProvider",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.impl.ICUCurrencyMetaInfo",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.impl.ICULangDataTables",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.impl.ICURegionDataTables",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.impl.LocaleDisplayNamesImpl",
-  "methods":[
-    {
-      "name":"getInstance",
-      "parameterTypes":[
-        "com.ibm.icu.util.ULocale",
-        "com.ibm.icu.text.DisplayContext[]"
-      ]
-    }
-  ]
-},
-{
-  "name":"com.ibm.icu.impl.TimeZoneNamesFactoryImpl",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.text.NumberFormatServiceShim",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.text.CollatorServiceShim",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.text.BreakIteratorFactory",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"com.ibm.icu.charset.CharsetUTF7",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String", "java.lang.String", "java.lang.String[]"]}]
-},
-{
-  "name":"com.ibm.icu.charset.CharsetHZ",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String", "java.lang.String", "java.lang.String[]"]}]
-},
 {
   "name":"java.util.Locale",
   "fields":[{"name":"US"}],

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/resource-config.json

@@ -1,6 +1,5 @@
 {
   "resources":[
-    {"pattern":"com/ibm/icu/impl/data/icudt.*"},
     {"pattern":"org/graalvm/shadowed/org/jline.*"}
   ]
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java

@@ -53,7 +53,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.ibm.icu.charset.CharsetICU;
+import org.graalvm.shadowed.com.ibm.icu.charset.CharsetICU;
 import com.oracle.graal.python.charset.PythonRawUnicodeEscapeCharset;
 import com.oracle.graal.python.charset.PythonUnicodeEscapeCharset;
 import com.oracle.graal.python.util.CharsetMappingFactory.NormalizeEncodingNameNodeGen;

mx.graalpython/suite.py

@@ -260,7 +260,7 @@
             "sourceDirs": ["src"],
             "javaCompliance": "17+",
             "dependencies": [
-                "truffle:ICU4J",
+                "truffle:TRUFFLE_ICU4J",
             ],
             "buildDependencies": [
                 "com.oracle.graal.python.pegparser.generator",
@@ -375,8 +375,7 @@
                 "sdk:GRAAL_SDK",
                 "sulong:SULONG_API",
                 "XZ-1.8",
-                "truffle:ICU4J",
-                "truffle:ICU4J-CHARSET",
+                "truffle:TRUFFLE_ICU4J",
                 "regex:TREGEX",
                 "BOUNCYCASTLE-PROVIDER",
                 "BOUNCYCASTLE-PKIX",
@@ -879,6 +878,7 @@
                 "sdk:GRAAL_SDK",
                 "sulong:SULONG_API",
                 "sulong:SULONG_NATIVE",  # this is actually just a runtime dependency
+                "truffle:TRUFFLE_ICU4J",
             ],
             "requires": [
                 "java.base",
@@ -892,8 +892,6 @@
                 "BOUNCYCASTLE-PROVIDER",
                 "BOUNCYCASTLE-PKIX",
                 "XZ-1.8",
-                "truffle:ICU4J",
-                "truffle:ICU4J-CHARSET",
             ],
             "javaProperties": {
                 "python.jni.library": "<lib:pythonjni>"