mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-05 21:45:37 +00:00
parent
1b292fa924
commit
d4ac09edbd
3982 changed files with 49 additions and 360 deletions
|
@ -161,6 +161,13 @@ cd $ICU4J_ROOT
|
|||
ant clean
|
||||
ant check 2>&1 | tee $NOTES/icu4j-oldData-antCheck.txt
|
||||
|
||||
# 2c. Additionally for ICU4J, repeat the same as 2b, but for building with
|
||||
# Maven instead of with Ant.
|
||||
|
||||
cd $ICU4J_ROOT/maven-build
|
||||
mvn clean
|
||||
mvn verify
|
||||
|
||||
# 3. Make pre-adjustments as necessary
|
||||
# 3a. Copy latest relevant CLDR dtds to ICU
|
||||
cp -p $CLDR_DIR/common/dtd/ldml.dtd $ICU4C_DIR/source/data/dtd/cldr/common/dtd/
|
||||
|
@ -307,12 +314,24 @@ make icu4j-data-install
|
|||
cd $ICU4C_DIR/source/test/testdata
|
||||
make icu4j-data-install
|
||||
|
||||
# 12c. Replace the extracted {main, test} data files in the Maven build
|
||||
|
||||
cd $ICU4J_ROOT/maven-build
|
||||
sh ./extract-data-files.sh
|
||||
|
||||
# 13. Now rebuild ICU4J with the new data and run tests:
|
||||
# Keep a log so you can investigate the errors.
|
||||
|
||||
# 13a. Run the tests using the ant build
|
||||
|
||||
cd $ICU4J_ROOT
|
||||
ant check 2>&1 | tee $NOTES/icu4j-newData-antCheck.txt
|
||||
|
||||
# 13b. Run the tests using the Maven build
|
||||
|
||||
cd $ICU4J_ROOT/maven-build
|
||||
mvn verify 2>&1 | tee $NOTES/icu4j-newData-mavenVerify.txt
|
||||
|
||||
# 14. Investigate test case failures; fix test cases and repeat from step 12,
|
||||
# or fix CLDR data and repeat from step 4, as appropriate, until there are no
|
||||
# more failures in ICU4C or ICU4J (except failures that were present before you
|
||||
|
|
28
icu4j/maven-build/extract-data-files.sh
Normal file
28
icu4j/maven-build/extract-data-files.sh
Normal file
|
@ -0,0 +1,28 @@
|
|||
#!/bin/bash
|
||||
# Copyright (C) 2023 and later: Unicode, Inc. and others.
|
||||
# License & terms of use: http://www.unicode.org/copyright.html
|
||||
|
||||
# This command will copy data files from the ICU4J jars built for the
|
||||
# Ant build by extracting and copying them over to the Maven build.
|
||||
#
|
||||
# If and when the Ant build is fully replaced by the Maven build, then the
|
||||
# upstream ICU4C make target `icu4j-data-install` can be modified accordingly
|
||||
# to copy the files directly for Maven, and then allowing this script to be
|
||||
# deleted.
|
||||
#
|
||||
# This script should be run from the root of the Maven build.
|
||||
|
||||
rm -rf maven-icu4j-datafiles/src/main/resources/*
|
||||
rm -rf maven-icu4j-test-datafiles/src/main/resources/*
|
||||
|
||||
unzip ../main/shared/data/icudata.jar \
|
||||
-d ./maven-icu4j-datafiles/src/main/resources/ \
|
||||
-x *MANIFEST.MF
|
||||
|
||||
unzip ../main/shared/data/icutzdata.jar\
|
||||
-d ./maven-icu4j-datafiles/src/main/resources/ \
|
||||
-x *MANIFEST.MF
|
||||
|
||||
unzip ../main/shared/data/testdata.jar\
|
||||
-d ./maven-icu4j-test-datafiles/src/main/resources/ \
|
||||
-x *MANIFEST.MF
|
|
@ -1,3 +0,0 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:09934fc4fb69ee51a8a8912fb5c96190d13b397edf51f4768c209a5d30772c3c
|
||||
size 14155180
|
|
@ -1,13 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icudata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<description>POM was created from install:install-file</description>
|
||||
</project>
|
|
@ -1,28 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata modelVersion="1.1.0">
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icudata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<versioning>
|
||||
<snapshot>
|
||||
<localCopy>true</localCopy>
|
||||
</snapshot>
|
||||
<lastUpdated>20230110032932</lastUpdated>
|
||||
<snapshotVersions>
|
||||
<snapshotVersion>
|
||||
<extension>jar</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032932</updated>
|
||||
</snapshotVersion>
|
||||
<snapshotVersion>
|
||||
<extension>pom</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032932</updated>
|
||||
</snapshotVersion>
|
||||
</snapshotVersions>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -1,15 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icudata</artifactId>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
</versions>
|
||||
<lastUpdated>20230110032932</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -1,3 +0,0 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e3aa048426aa3fe4b008ffe2f3d6924f23077cee8305e55b6d8df4195cd2119f
|
||||
size 93607
|
|
@ -1,13 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icutzdata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<description>POM was created from install:install-file</description>
|
||||
</project>
|
|
@ -1,28 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata modelVersion="1.1.0">
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icutzdata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<versioning>
|
||||
<snapshot>
|
||||
<localCopy>true</localCopy>
|
||||
</snapshot>
|
||||
<lastUpdated>20230110032933</lastUpdated>
|
||||
<snapshotVersions>
|
||||
<snapshotVersion>
|
||||
<extension>jar</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032933</updated>
|
||||
</snapshotVersion>
|
||||
<snapshotVersion>
|
||||
<extension>pom</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032933</updated>
|
||||
</snapshotVersion>
|
||||
</snapshotVersions>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -1,15 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icutzdata</artifactId>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
</versions>
|
||||
<lastUpdated>20230110032933</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -1,28 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata modelVersion="1.1.0">
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>testdata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<versioning>
|
||||
<snapshot>
|
||||
<localCopy>true</localCopy>
|
||||
</snapshot>
|
||||
<lastUpdated>20230110032934</lastUpdated>
|
||||
<snapshotVersions>
|
||||
<snapshotVersion>
|
||||
<extension>jar</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032934</updated>
|
||||
</snapshotVersion>
|
||||
<snapshotVersion>
|
||||
<extension>pom</extension>
|
||||
<value>73.1-SNAPSHOT</value>
|
||||
<updated>20230110032934</updated>
|
||||
</snapshotVersion>
|
||||
</snapshotVersions>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -1,3 +0,0 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e38d8586075350ada88af3a84ed178cf35b205f66131c3d87d2d17830567e75c
|
||||
size 831615
|
|
@ -1,13 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>testdata</artifactId>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
<description>POM was created from install:install-file</description>
|
||||
</project>
|
|
@ -1,15 +0,0 @@
|
|||
<!--
|
||||
© 2022 and later: Unicode, Inc. and others.
|
||||
License & terms of use: http://www.unicode.org/copyright.html
|
||||
-->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<metadata>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>testdata</artifactId>
|
||||
<versioning>
|
||||
<versions>
|
||||
<version>73.1-SNAPSHOT</version>
|
||||
</versions>
|
||||
<lastUpdated>20230110032934</lastUpdated>
|
||||
</versioning>
|
||||
</metadata>
|
|
@ -26,73 +26,6 @@
|
|||
<packaging>jar</packaging>
|
||||
|
||||
<name>ICU4J Data Files</name>
|
||||
<description>Various *.jar files needed by ICU4J components' main code.</description>
|
||||
|
||||
<!--
|
||||
We need to put the local repo repository here because it didn't seem possible
|
||||
to put it in the parent POM and correctly inherit the information and find the
|
||||
artifacts accordingly.
|
||||
-->
|
||||
<!--
|
||||
The ${basedir} will (hopefully) only be resolved from this child directory, and
|
||||
not the root directory or anywhere else.
|
||||
-->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>local-maven-repo</id>
|
||||
<url>file:${basedir}/../local-maven-repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icudata</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icutzdata</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-remote-resources-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>process-remote-resources</id>
|
||||
<goals>
|
||||
<goal>bundle</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-dependencies</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>unpack-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<includeGroupIds>com.ibm.icu</includeGroupIds>
|
||||
<excludes>**/*.jar</excludes>
|
||||
<outputDirectory>${project.build.directory}/classes</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<description>Various resource files needed by ICU4J components' main code.</description>
|
||||
|
||||
</project>
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue