From 2612b8b55af90106c11422a3558006bdc8016bc4 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Fri, 25 Mar 2022 14:50:29 -0500
Subject: [PATCH] ICU-21965 fix utilities.jar module name

com.ibm.icu.utilities - otherwise the automatic module name is unusable
---
 icu4j/build.xml                           |  9 +++++++++
 icu4j/tools/build/manifest-utilities.stub | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 icu4j/tools/build/manifest-utilities.stub

diff --git a/icu4j/build.xml b/icu4j/build.xml
index c7ee8ffa883..d77d9b7d922 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -1945,8 +1945,17 @@
         </javac>
 
         <mkdir dir="${cldr.util.out.dir}/lib"/>
+        <copy file="tools/build/manifest-utilities.stub" todir="${out.dir}">
+            <filterset>
+                <filter token="SPECVERSION" value="${jar.spec.version}"/>
+                <filter token="IMPLVERSION" value="${jar.impl.version}"/>
+                <filter token="COPYRIGHT" value="${jar.copyright.info}"/>
+                <filter token="EXECENV" value="${jar.exec.env}"/>
+            </filterset>
+        </copy>
         <jar jarfile="${cldr.util.out.dir}/lib/utilities.jar"
                 compress="true"
+                manifest="${out.dir}/manifest-utilities.stub"
                 basedir="${cldr.util.out.dir}/bin">
             <include name="com/ibm/icu/dev/util/*.class"/>
             <include name="com/ibm/icu/dev/tool/UOption*.class"/>
diff --git a/icu4j/tools/build/manifest-utilities.stub b/icu4j/tools/build/manifest-utilities.stub
new file mode 100644
index 00000000000..fda53579ead
--- /dev/null
+++ b/icu4j/tools/build/manifest-utilities.stub
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Specification-Title: International Components for Unicode for Java Utilities
+Specification-Version: @SPECVERSION@
+Specification-Vendor: Unicode, Inc.
+Implementation-Title: International Components for Unicode for Java Utilities
+Implementation-Version: @IMPLVERSION@
+Implementation-Vendor: Unicode, Inc.
+Implementation-Vendor-Id: org.unicode
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4JUtilities
+Bundle-Description: International Components for Unicode for Java Utilities
+Bundle-SymbolicName: com.ibm.icu.utilities
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: Unicode, Inc.
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
+Automatic-Module-Name: com.ibm.icu.utilities