From deab8eef82c2005d7690b8dd9e95b24ca325d10b Mon Sep 17 00:00:00 2001 From: Elango Cheran Date: Thu, 5 Oct 2023 18:40:23 +0000 Subject: [PATCH] ICU-22324 Update Maven migration scripts See #2661 --- icu4j/extract-data-files.sh | 0 icu4j/maven-migration/demos/pom.xml | 14 +- icu4j/maven-migration/main/charset/pom.xml | 8 +- icu4j/maven-migration/main/collate/pom.xml | 17 +- .../maven-migration/main/common_tests/pom.xml | 12 +- icu4j/maven-migration/main/core/pom.xml | 15 +- icu4j/maven-migration/main/currdata/pom.xml | 17 +- icu4j/maven-migration/main/framework/pom.xml | 16 +- icu4j/maven-migration/main/icu4j/pom.xml | 68 +++- icu4j/maven-migration/main/langdata/pom.xml | 17 +- icu4j/maven-migration/main/localespi/pom.xml | 48 ++- icu4j/maven-migration/main/pom.xml | 43 --- icu4j/maven-migration/main/regiondata/pom.xml | 17 +- icu4j/maven-migration/main/translit/pom.xml | 17 +- icu4j/maven-migration/perf-tests/pom.xml | 55 +++ icu4j/maven-migration/pom.xml | 320 ++++++++++++++++-- icu4j/maven-migration/samples/pom.xml | 14 +- icu4j/maven-migration/toMaven.sh | 112 ++++-- icu4j/maven-migration/tools/build/pom.xml | 14 +- icu4j/maven-migration/tools/misc/pom.xml | 9 +- .../tools/utilities-for-cldr/pom.xml | 94 +++++ 21 files changed, 767 insertions(+), 160 deletions(-) mode change 100755 => 100644 icu4j/extract-data-files.sh delete mode 100644 icu4j/maven-migration/main/pom.xml create mode 100644 icu4j/maven-migration/perf-tests/pom.xml create mode 100644 icu4j/maven-migration/tools/utilities-for-cldr/pom.xml diff --git a/icu4j/extract-data-files.sh b/icu4j/extract-data-files.sh old mode 100755 new mode 100644 diff --git a/icu4j/maven-migration/demos/pom.xml b/icu4j/maven-migration/demos/pom.xml index b393e620371..3c35f57cc56 100644 --- a/icu4j/maven-migration/demos/pom.xml +++ b/icu4j/maven-migration/demos/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 74.0.1-SNAPSHOT + 74.1-SNAPSHOT demos @@ -35,4 +35,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/main/charset/pom.xml b/icu4j/maven-migration/main/charset/pom.xml index 630350a957e..b911c2a0f93 100644 --- a/icu4j/maven-migration/main/charset/pom.xml +++ b/icu4j/maven-migration/main/charset/pom.xml @@ -7,11 +7,13 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml icu4j-charset + icu4j-charset is a supplemental library for icu4j, implementing Java Charset SPI. ${project.basedir}/../.. @@ -22,7 +24,7 @@ com.ibm.icu - core + icu4j ${project.version} diff --git a/icu4j/maven-migration/main/collate/pom.xml b/icu4j/maven-migration/main/collate/pom.xml index 6d7ccfaae3c..a4ffdc12d43 100644 --- a/icu4j/maven-migration/main/collate/pom.xml +++ b/icu4j/maven-migration/main/collate/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml collate @@ -66,4 +67,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/main/common_tests/pom.xml b/icu4j/maven-migration/main/common_tests/pom.xml index e70a1eefb70..17237e54a44 100644 --- a/icu4j/maven-migration/main/common_tests/pom.xml +++ b/icu4j/maven-migration/main/common_tests/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml common_tests @@ -96,6 +97,13 @@ + + maven-deploy-plugin + + + true + + diff --git a/icu4j/maven-migration/main/core/pom.xml b/icu4j/maven-migration/main/core/pom.xml index 69db25d3a96..3fa38b170af 100644 --- a/icu4j/maven-migration/main/core/pom.xml +++ b/icu4j/maven-migration/main/core/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml core @@ -52,9 +53,6 @@ - - - maven-jar-plugin @@ -63,6 +61,13 @@ + + maven-deploy-plugin + + + true + + diff --git a/icu4j/maven-migration/main/currdata/pom.xml b/icu4j/maven-migration/main/currdata/pom.xml index 9ec3ef5871b..08388948449 100644 --- a/icu4j/maven-migration/main/currdata/pom.xml +++ b/icu4j/maven-migration/main/currdata/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml currdata @@ -26,4 +27,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/main/framework/pom.xml b/icu4j/maven-migration/main/framework/pom.xml index aee519f4c95..140f44a0a03 100644 --- a/icu4j/maven-migration/main/framework/pom.xml +++ b/icu4j/maven-migration/main/framework/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml framework @@ -38,9 +39,6 @@ - - - maven-jar-plugin @@ -49,8 +47,14 @@ + + maven-deploy-plugin + + + true + + - diff --git a/icu4j/maven-migration/main/icu4j/pom.xml b/icu4j/maven-migration/main/icu4j/pom.xml index c01d56d1eec..3fef0f1690b 100644 --- a/icu4j/maven-migration/main/icu4j/pom.xml +++ b/icu4j/maven-migration/main/icu4j/pom.xml @@ -8,11 +8,14 @@ com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml icu4j + International Components for Unicode for Java (ICU4J) is a mature, widely used Java library + providing Unicode and Globalization support ${project.basedir}/../.. @@ -66,6 +69,15 @@ org.apache.maven.plugins maven-shade-plugin + + source-jar + + shade + + + true + + shade @@ -75,22 +87,60 @@ true ${project.build.directory}/dependency-reduced-pom.xml true + true + + + + com.ibm.icu.util.VersionInfo + com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util + + + - maven-jar-plugin + maven-clean-plugin - - - com.ibm.icu.util.VersionInfo - com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.number,com.ibm.icu.text,com.ibm.icu.util - - + + + . + + **/dependency-reduced-pom.xml + + false + + + + + with_javadoc + + + + maven-javadoc-plugin + + + + jar + + + + true + + + + + + + + + diff --git a/icu4j/maven-migration/main/langdata/pom.xml b/icu4j/maven-migration/main/langdata/pom.xml index f367b5505c9..2d754234d32 100644 --- a/icu4j/maven-migration/main/langdata/pom.xml +++ b/icu4j/maven-migration/main/langdata/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml langdata @@ -26,4 +27,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/main/localespi/pom.xml b/icu4j/maven-migration/main/localespi/pom.xml index ae4b1364512..b9d320f908b 100644 --- a/icu4j/maven-migration/main/localespi/pom.xml +++ b/icu4j/maven-migration/main/localespi/pom.xml @@ -7,11 +7,13 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml icu4j-localespi + icu4j-localespi is a supplemental library for icu4j, implementing Java Locale SPI. JDK locale service provider @@ -81,10 +83,10 @@ - - org.apache.maven.plugins maven-dependency-plugin @@ -125,9 +126,7 @@ - org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 @@ -145,7 +144,7 @@ **/*ITCase.java - - ${localespi-tests.jvm.args} - @@ -218,6 +217,33 @@ CLDR,COMPAT,SPI + + with_javadoc + + + + maven-javadoc-plugin + + + + jar + + + + + ICULocaleServiceProvider.java + + ${basedir}/src/main/java/com/ibm/icu/impl/javaspi + + + + + + + diff --git a/icu4j/maven-migration/main/pom.xml b/icu4j/maven-migration/main/pom.xml deleted file mode 100644 index 4bc19ce624b..00000000000 --- a/icu4j/maven-migration/main/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - - com.ibm.icu - icu4j-root - 74.0.1-SNAPSHOT - - - main - pom - - - ${project.basedir}/.. - - - - framework - core - - - charset - collate - currdata - langdata - regiondata - translit - common_tests - - - icu4j - - - localespi - - - diff --git a/icu4j/maven-migration/main/regiondata/pom.xml b/icu4j/maven-migration/main/regiondata/pom.xml index 179aa7ad805..c12261455c7 100644 --- a/icu4j/maven-migration/main/regiondata/pom.xml +++ b/icu4j/maven-migration/main/regiondata/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml regiondata @@ -26,4 +27,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/main/translit/pom.xml b/icu4j/maven-migration/main/translit/pom.xml index eee8980f4f9..0afd70003b8 100644 --- a/icu4j/maven-migration/main/translit/pom.xml +++ b/icu4j/maven-migration/main/translit/pom.xml @@ -7,8 +7,9 @@ 4.0.0 com.ibm.icu - main - 74.0.1-SNAPSHOT + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml translit @@ -61,4 +62,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/perf-tests/pom.xml b/icu4j/maven-migration/perf-tests/pom.xml new file mode 100644 index 00000000000..e10ea7c18eb --- /dev/null +++ b/icu4j/maven-migration/perf-tests/pom.xml @@ -0,0 +1,55 @@ + + + + 4.0.0 + + com.ibm.icu + icu4j-root + 74.1-SNAPSHOT + + + perf-tests + + + perf_tests + + + + + com.ibm.icu + core + ${project.version} + + + com.ibm.icu + collate + ${project.version} + + + com.ibm.icu + icu4j-charset + ${project.version} + + + com.ibm.icu + tools_misc + ${project.version} + + + + + + + maven-deploy-plugin + + + true + + + + + + diff --git a/icu4j/maven-migration/pom.xml b/icu4j/maven-migration/pom.xml index e22dea87a17..341057fd782 100644 --- a/icu4j/maven-migration/pom.xml +++ b/icu4j/maven-migration/pom.xml @@ -1,6 +1,6 @@ @@ -8,12 +8,15 @@ com.ibm.icu icu4j-root - 74.0.1-SNAPSHOT + 74.1-SNAPSHOT pom ${proj-title} (${project.artifactId}) - International Component for Unicode for Java (ICU4J) is a mature, widely used Java library - providing Unicode and Globalization support + International Components for Unicode for Java (ICU4J) is a mature, widely used Java library + providing Unicode and Globalization support. + This is the base artifact with common settings, not intended to use directly. + https://icu.unicode.org/ + 1995 Unicode, Inc. @@ -21,10 +24,28 @@ - main + main/framework + main/core + + main/charset + main/collate + main/currdata + main/langdata + main/regiondata + main/translit + main/common_tests + + main/icu4j + + main/localespi + demos samples tools/misc + tools/utilities-for-cldr + perf-tests @@ -32,26 +53,33 @@ 1.8 1.8 + https://oss.sonatype.org + ${maven-central-repo-url}/content/repositories/snapshots + 4.13.2 1.1.1 International Components for Unicode for Java ${project.artifactId} + + 74 + - 74 Release Candidate + + ${icu.major.version} Release Candidate ICU4J ${api.doc.version} ICU4J ${api.doc.version} <font size=-1>Copyright © 2016 Unicode, Inc. and others.</font> + ${project.basedir} + ${icu.major.version} - - 74 - 74.0.1 - 74.0.1 - + ${icu.major.version} + ${project.version} + ${project.version} JavaSE-1.8 @@ -74,6 +102,81 @@ © 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html + + + Unicode/ICU License + https://raw.githubusercontent.com/unicode-org/icu/main/LICENSE + repo + + + + + + markusicu + Markus Scherer + Google + + Chair + + + + yumaoka + Yoshito Umaoka + IBM + + Vice chair + + + + + + + icu-support + https://lists.sourceforge.net/lists/listinfo/icu-support + https://lists.sourceforge.net/lists/listinfo/icu-support + icu-support@lists.sourceforge.net + http://sourceforge.net/mailarchive/forum.php?forum_name=icu-support + + + icu-announce + https://lists.sourceforge.net/lists/listinfo/icu-announce + https://lists.sourceforge.net/lists/listinfo/icu-announce + icu-announce@lists.sourceforge.net + http://sourceforge.net/mailarchive/forum.php?forum_name=icu-announce + + + icu-design + https://lists.sourceforge.net/lists/listinfo/icu-design + https://lists.sourceforge.net/lists/listinfo/icu-design + icu-design@lists.sourceforge.net + http://sourceforge.net/mailarchive/forum.php?forum_name=icu-design + + + + + scm:git:git://github.com/unicode-org/icu.git + scm:git:git@github.com:unicode-org/icu.git + https://github.com/unicode-org/icu + + + + JIRA + https://unicode-org.atlassian.net/projects/ICU + + + + + icu4j-releases + ICU4J Central Repository + ${maven-central-releases-repo-url} + + + icu4j-snapshots + ICU4J Central Development Repository + ${maven-central-snapshots-repo-url} + + + @@ -88,10 +191,34 @@ maven-compiler-plugin 3.11.0 + + + ${maven.compiler.source} + ${maven.compiler.target} + maven-surefire-plugin 3.1.2 + + + + **/*.java + + + + + maven-failsafe-plugin + 3.1.2 maven-install-plugin @@ -125,6 +252,43 @@ maven-dependency-plugin 3.6.0 + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + + + + add-resource + + add-resource + + + true + + + ${rootlocation}/.. + + LICENSE + + + + + + + root-location + initialize + + rootlocation + + + + maven-release-plugin 3.0.1 @@ -132,6 +296,21 @@ maven-enforcer-plugin 3.3.0 + + + enforce-maven + + enforce + + + + + 3.2.5 + + + + + maven-javadoc-plugin @@ -169,20 +348,22 @@ com.ibm.icu.dev.tool.docs.ICUTaglet - - ${icu4j.api.doc.root.dir}/tools/build/target/classes + + com.ibm.icu + tools_build + ${project.version} + ch.arrenbrecht.jcite.JCiteTaglet + + org.mcraig + jcite + 1.13.0 + - - org.mcraig - jcite - 1.13.0 - commons-discovery @@ -242,21 +423,10 @@ org.apache.maven.plugins maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - 3.2.5 - - - - - + + + org.codehaus.mojo + build-helper-maven-plugin @@ -265,7 +435,6 @@ - with_sources @@ -286,7 +455,6 @@ - with_javadoc @@ -327,10 +495,63 @@ + + + gatherapi + + + + maven-javadoc-plugin + + + aggregate + site + + aggregate + + + + + + false + false + com.ibm.icu.dev.tool.docs.GatherAPIData + + com.ibm.icu + tools_build + ${project.version} + + + -name 'ICU4J ${mf.Implementation-Version}' + -output ${project.build.directory}/icu4j${icu4j.api.report.version}.api3 + -internal + -version + -gzip + + + + + + + old_jdk_taglet @@ -341,6 +562,31 @@ tools/build + + + + newer_jdk + + [9,) + + + + + maven-compiler-plugin + + 8 + + + + + + diff --git a/icu4j/maven-migration/samples/pom.xml b/icu4j/maven-migration/samples/pom.xml index 353d9c09078..6795c80febb 100644 --- a/icu4j/maven-migration/samples/pom.xml +++ b/icu4j/maven-migration/samples/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 74.0.1-SNAPSHOT + 74.1-SNAPSHOT samples @@ -30,4 +30,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/toMaven.sh b/icu4j/maven-migration/toMaven.sh index 0611f654ba5..b7f8899001a 100755 --- a/icu4j/maven-migration/toMaven.sh +++ b/icu4j/maven-migration/toMaven.sh @@ -28,6 +28,17 @@ # # Then we cleanup older Eclipse project & launcher files, ant scripts, manifest.stub +function safeMkdir() { + mkdir -p "$1" +} + +function moveOrRename() { + local SRC=$1 + local DEST=$2 + + mv "$SRC" "$DEST" +} + function rmDirIfExists() { [ -d "$1" ] && rm -fr "$1" } @@ -36,10 +47,17 @@ function rmFileIfExists() { [ -f "$1" ] && rm "$1" } +function copyRecursive() { + local SRC=$1 + local DEST=$2 + + cp -R "$SRC" "$DEST" +} + function safeMoveDir() { - export FOLDER_NAME=$1 - export FROM_FOLDER=$2 - export TO_FOLDER=$3 + local FOLDER_NAME=$1 + local FROM_FOLDER=$2 + local TO_FOLDER=$3 if [ ! -d "$FROM_FOLDER/$FOLDER_NAME" ]; then echo " No '$FROM_FOLDER/$FOLDER_NAME' to move." @@ -49,29 +67,43 @@ function safeMoveDir() { echo " Error: folder '$TO_FOLDER/$FOLDER_NAME' already exists!" exit else - mkdir -p $TO_FOLDER - mv $FROM_FOLDER/$FOLDER_NAME $TO_FOLDER/ + safeMkdir $TO_FOLDER + moveOrRename $FROM_FOLDER/$FOLDER_NAME $TO_FOLDER/ echo " Moving '$FOLDER_NAME' folder from '$FROM_FOLDER' to '$TO_FOLDER'" fi } +function rmFileGlobInDir() { + local DIR=$1 + local PATTERN=$2 + + find "$DIR" -type f -name "$PATTERN" -exec rm {} \; +} + +function keepOnlyFileGlobInDir() { + local DIR=$1 + local PATTERN=$2 + + find "$DIR" -type f -not -name "$PATTERN" -exec rm {} \; +} + # Split the content of the `java` foldert into `java` and `resources`, the way maven wants it function splitJavaToResources() { # Should point to the folder containing `java`, either main/ or test/ - export BASE_FOLDER=$1 + local BASE_FOLDER=$1 echo " Splitting '$BASE_FOLDER/java/' into '$BASE_FOLDER/java/' and '$BASE_FOLDER/resources/'" # copy `java` to `resources` - cp -R $BASE_FOLDER/java/ $BASE_FOLDER/resources/ + copyRecursive $BASE_FOLDER/java/ $BASE_FOLDER/resources/ # delete all not `.java` from `java` - find $BASE_FOLDER/java/ -type f -not -name *.java -exec rm {} \; + keepOnlyFileGlobInDir $BASE_FOLDER/java/ *.java # delete all `.java` from `resources` - find $BASE_FOLDER/resources/ -type f -name *.java -exec rm {} \; + rmFileGlobInDir $BASE_FOLDER/resources/ *.java } function removeEclipseProjectFiles() { # Should point to the old folder (to be moved), containing the eclipse / ant files - export BASE_FOLDER=$1 + local BASE_FOLDER=$1 # Cleanup Eclipse project & launcher files, ant projects, other stuff # Eclipse @@ -89,7 +121,7 @@ function removeEclipseProjectFiles() { # Takes a folder as parameter and removes the all the empty sub-folders. function removeEmptyFolders() { - export BASE_FOLDER=$1 + local BASE_FOLDER=$1 # `find -type d .` finds all subfolders, empty or not. # We can't just force delete (-r), as that would also delete non-empty folders. # And the find iteration is not children first, but parent first. @@ -112,11 +144,11 @@ function removeEmptyFolders() { function moveMainModuleToMaven() { # 1. $1: component name (core, charset, etc) - export MODULE_NAME=$1 + local MODULE_NAME=$1 # 2. folder name in the pre-maven structure (`classes` or `tests`) - export SRC_TYPE=$2 + local SRC_TYPE=$2 # 3. folder name in the maven standard structure (`main` or `test`) - export TRG_TYPE=$3 + local TRG_TYPE=$3 if [ ! -d main/$SRC_TYPE/$MODULE_NAME ]; then echo " Module '$MODULE_NAME' does not have '$SRC_TYPE' to move to '$TRG_TYPE'" @@ -148,14 +180,14 @@ function mainModuleToMaven() { echo "Migrating $1 to maven" moveMainModuleToMaven $1 classes main moveMainModuleToMaven $1 tests test - mkdir -p main/$MODULE_NAME/src/main/resources/ + safeMkdir main/$MODULE_NAME/src/main/resources/ ln -s ../../../../../../LICENSE main/$MODULE_NAME/src/main/resources/LICENSE } function simpleModuleToMaven() { # 1. $1: component name (core, charset, etc) - export MODULE_NAME=$1 - export LICENSE_PATH=$2 + local MODULE_NAME=$1 + local LICENSE_PATH=$2 echo "Migrating $MODULE_NAME to maven" safeMoveDir com $MODULE_NAME/src $MODULE_NAME/src/main/java @@ -163,7 +195,7 @@ function simpleModuleToMaven() { removeEclipseProjectFiles $MODULE_NAME - mkdir -p $MODULE_NAME/src/main/resources/ + safeMkdir $MODULE_NAME/src/main/resources/ ln -s $LICENSE_PATH $MODULE_NAME/src/main/resources/LICENSE echo " Remove empty folders from '$MODULE_NAME'" @@ -171,22 +203,24 @@ function simpleModuleToMaven() { } function moveCoreTestFileToCommon() { - export FOLDER_NAME=$1 - export FILE_NAME=$2 - mkdir -p $COMMON_TEST_FOLDER/$FOLDER_NAME - mv $CORE_TEST_FOLDER/$FOLDER_NAME/$FILE_NAME $COMMON_TEST_FOLDER/$FOLDER_NAME/ + local FOLDER_NAME=$1 + local FILE_NAME=$2 + safeMkdir $COMMON_TEST_FOLDER/$FOLDER_NAME + moveOrRename $CORE_TEST_FOLDER/$FOLDER_NAME/$FILE_NAME $COMMON_TEST_FOLDER/$FOLDER_NAME/ } function moveCircDepTestOutOfCore() { export CORE_TEST_FOLDER=main/core/src/test/java/com/ibm/icu/dev/test export COMMON_TEST_FOLDER=main/common_tests/src/test/java/com/ibm/icu/dev/test - mkdir -p $CORE_TEST_FOLDER + safeMkdir $CORE_TEST_FOLDER moveCoreTestFileToCommon calendar DataDrivenCalendarTest.java moveCoreTestFileToCommon format CompactDecimalFormatTest.java moveCoreTestFileToCommon format DataDrivenFormatTest.java moveCoreTestFileToCommon format DateFormatTest.java + moveCoreTestFileToCommon format IntlTestDecimalFormatSymbolsC.java + moveCoreTestFileToCommon format IntlTestDecimalFormatAPIC.java moveCoreTestFileToCommon format MeasureUnitTest.java moveCoreTestFileToCommon format NumberFormatDataDrivenTest.java moveCoreTestFileToCommon format NumberFormatRegressionTest.java @@ -226,7 +260,7 @@ function moveCircDepTestOutOfCore() { # Looks like the packaging project was already some kind of test for how things come together. # Should we move all the files in this project instead of common_tests? - mv main/tests/packaging/src/com/ibm/icu/dev/test/* $COMMON_TEST_FOLDER/ + moveOrRename main/tests/packaging/src/com/ibm/icu/dev/test/* $COMMON_TEST_FOLDER/ removeEclipseProjectFiles main/tests/packaging # At this point this folder should be empty @@ -234,6 +268,14 @@ function moveCircDepTestOutOfCore() { rm -d main/core/src/test/java/com/ibm/icu/dev/test/serializable } +function moveFilesInTools() { + local TOOLS_SRC_ROOT_FOLDER=tools/misc/src/main/java/com/ibm/icu/dev/tool + local TOOLS_SRC_SHARED_SUBFOLDER=tools/misc/src/main/java/com/ibm/icu/dev/tool/shared + + safeMkdir $TOOLS_SRC_SHARED_SUBFOLDER + moveOrRename $TOOLS_SRC_ROOT_FOLDER/UOption.java $TOOLS_SRC_SHARED_SUBFOLDER/ +} + # =============================================================== # Here starts the real script execution @@ -247,13 +289,13 @@ if [ ! -f "main/classes/core/build.xml" ]; then exit fi +# Copy over most files from `maven-migration` dir needed for Maven build... MVN_MIG_DIR="$(dirname "${BASH_SOURCE[0]}")" - -cp -R ${MVN_MIG_DIR}/* . -# Don't copy files that are only used for migration -rm README_MAVEN.md -rm toMaven.sh -rm unpack_jars.sh +copyRecursive ${MVN_MIG_DIR}/* . +# ...but don't copy files that are only used for migration +rmFileIfExists README_MAVEN.md +rmFileIfExists toMaven.sh +rmFileIfExists unpack_jars.sh # Migrate the modules in icu4j/main, which have code (in main/classes) & unit tests (in main/test) echo "====================================" @@ -286,6 +328,16 @@ echo "========================================================================== moveCircDepTestOutOfCore +echo "=================================================================" +echo "==== Move files to resolve dependency cycles in tools, etc. =====" +echo "=================================================================" + +moveFilesInTools + +# Cleanup of Ant-specific dirs & prototype Maven build dirs +rmDirIfExists "$BASE_FOLDER/maven/" +rmDirIfExists "$BASE_FOLDER/maven-build/" + # Some final cleanup for any empty folders removeEmptyFolders main/classes removeEmptyFolders main/tests diff --git a/icu4j/maven-migration/tools/build/pom.xml b/icu4j/maven-migration/tools/build/pom.xml index b55f3db3e65..e222ac9686a 100644 --- a/icu4j/maven-migration/tools/build/pom.xml +++ b/icu4j/maven-migration/tools/build/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 74.0.1-SNAPSHOT + 74.1-SNAPSHOT ../../pom.xml @@ -28,4 +28,16 @@ + + + + maven-deploy-plugin + + + true + + + + + diff --git a/icu4j/maven-migration/tools/misc/pom.xml b/icu4j/maven-migration/tools/misc/pom.xml index 913598bb1f1..78942408839 100644 --- a/icu4j/maven-migration/tools/misc/pom.xml +++ b/icu4j/maven-migration/tools/misc/pom.xml @@ -8,7 +8,7 @@ com.ibm.icu icu4j-root - 74.0.1-SNAPSHOT + 74.1-SNAPSHOT ../../pom.xml @@ -43,6 +43,13 @@ + + maven-deploy-plugin + + + true + + diff --git a/icu4j/maven-migration/tools/utilities-for-cldr/pom.xml b/icu4j/maven-migration/tools/utilities-for-cldr/pom.xml new file mode 100644 index 00000000000..210dd20844e --- /dev/null +++ b/icu4j/maven-migration/tools/utilities-for-cldr/pom.xml @@ -0,0 +1,94 @@ + + + + 4.0.0 + + com.ibm.icu + icu4j-root + 74.1-SNAPSHOT + ../../pom.xml + + + utilities-for-cldr + jar + + + Utilities + com.ibm.icu.utilities + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ../misc/src/main/java/com/ibm/icu/dev/tool/shared + ../../main/framework/src/test/java/com/ibm/icu/dev/util + ../../main/translit/src/test/java/com/ibm/icu/dev/util + + + + + + + + maven-javadoc-plugin + + true + + + + + maven-deploy-plugin + + true + + + + + + + + com.ibm.icu + icu4j + ${project.version} + + + + + + cldr_utilities + + + + + maven-deploy-plugin + + false + + + + + + + +