Skip to content

Commit

Permalink
ICU-21965 fix utilities.jar module name
Browse files Browse the repository at this point in the history
com.ibm.icu.utilities - otherwise the automatic module name is unusable
  • Loading branch information
srl295 committed Mar 30, 2022
1 parent ed1d9ef commit 2612b8b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
9 changes: 9 additions & 0 deletions icu4j/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
17 changes: 17 additions & 0 deletions icu4j/tools/build/manifest-utilities.stub
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 2612b8b

Please sign in to comment.