diff --git a/icu4j/build.properties b/icu4j/build.properties index f31bff33a90..fe39225498d 100644 --- a/icu4j/build.properties +++ b/icu4j/build.properties @@ -4,3 +4,4 @@ #******************************************************************************* api.report.version = 451 api.report.prev.version = 44 +release.file.ver = 4_5_1 diff --git a/icu4j/build.xml b/icu4j/build.xml index f414443fa26..d20658512a3 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -10,17 +10,34 @@ + + + - - + - + + + + - + + + + + + + + + + + + + @@ -78,11 +95,12 @@ - + + @@ -92,7 +110,7 @@ - + @@ -334,28 +352,145 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/demos/build.xml b/icu4j/demos/build.xml index 3187e793838..a47a7c4de4a 100644 --- a/icu4j/demos/build.xml +++ b/icu4j/demos/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,4 +27,5 @@ + \ No newline at end of file diff --git a/icu4j/main/classes/charset/build.xml b/icu4j/main/classes/charset/build.xml index b9c0493f2ef..28efad3b7ee 100644 --- a/icu4j/main/classes/charset/build.xml +++ b/icu4j/main/classes/charset/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/classes/collate/build.xml b/icu4j/main/classes/collate/build.xml index 6d78df99d6a..a9d75b699e3 100644 --- a/icu4j/main/classes/collate/build.xml +++ b/icu4j/main/classes/collate/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/classes/core/build.xml b/icu4j/main/classes/core/build.xml index 6006c856306..5dad4a9e39a 100644 --- a/icu4j/main/classes/core/build.xml +++ b/icu4j/main/classes/core/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/classes/currdata/build.xml b/icu4j/main/classes/currdata/build.xml index 3051404f6a0..2e48161b2e8 100644 --- a/icu4j/main/classes/currdata/build.xml +++ b/icu4j/main/classes/currdata/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/classes/langdata/build.xml b/icu4j/main/classes/langdata/build.xml index 3f22b8e9e1a..51fc445c458 100644 --- a/icu4j/main/classes/langdata/build.xml +++ b/icu4j/main/classes/langdata/build.xml @@ -1,6 +1,6 @@ @@ -13,8 +13,10 @@ + + - + @@ -26,6 +28,8 @@ + + diff --git a/icu4j/main/classes/localespi/build.xml b/icu4j/main/classes/localespi/build.xml index ca3a156b270..2239f0c230a 100644 --- a/icu4j/main/classes/localespi/build.xml +++ b/icu4j/main/classes/localespi/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,4 +27,5 @@ + \ No newline at end of file diff --git a/icu4j/main/classes/regiondata/build.xml b/icu4j/main/classes/regiondata/build.xml index f990b764d2d..13c2ed8317b 100644 --- a/icu4j/main/classes/regiondata/build.xml +++ b/icu4j/main/classes/regiondata/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/classes/translit/build.xml b/icu4j/main/classes/translit/build.xml index f5ac7af1909..cd976512f41 100644 --- a/icu4j/main/classes/translit/build.xml +++ b/icu4j/main/classes/translit/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml index 1807f28f6db..8623516bf6b 100644 --- a/icu4j/main/shared/build/common-targets.xml +++ b/icu4j/main/shared/build/common-targets.xml @@ -1,6 +1,6 @@ @@ -8,6 +8,7 @@ + @@ -34,7 +35,8 @@ classpathref="javac.classpathref" source="${javac.source}" target="${javac.target}" - debug="${javac.debug}"> + debug="${javac.debug}" + includeAntRuntime="no"> @@ -59,7 +61,7 @@ - + @@ -68,6 +70,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -222,7 +244,9 @@ - + + + diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 34e23b41d72..6b8489c25b9 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -35,7 +35,7 @@ icu4j.testdata.jar = ${shared.dir}/data/testdata.jar icu4j.core.jar = ${icu4j.core.dir}/${jar.dir}/icu4j-core.jar icu4j.collate.jar = ${icu4j.collate.dir}/${jar.dir}/icu4j-collate.jar -icu4j.charset.jar = ${icu4j.charset.dir}/${jar.dir}/icu4j-charsets.jar +icu4j.charset.jar = ${icu4j.charset.dir}/${jar.dir}/icu4j-charset.jar icu4j.currdata.jar = ${icu4j.currdata.dir}/${jar.dir}/icu4j-currdata.jar icu4j.langdata.jar = ${icu4j.langdata.dir}/${jar.dir}/icu4j-langdata.jar icu4j.localespi.jar = ${icu4j.localespi.dir}/${jar.dir}/icu4j-localespi.jar diff --git a/icu4j/main/tests/charset/build.xml b/icu4j/main/tests/charset/build.xml index af65eff6694..f412b8bd607 100644 --- a/icu4j/main/tests/charset/build.xml +++ b/icu4j/main/tests/charset/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/tests/collate/build.xml b/icu4j/main/tests/collate/build.xml index f0021e0bc8f..abbf27e1b10 100644 --- a/icu4j/main/tests/collate/build.xml +++ b/icu4j/main/tests/collate/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/tests/core/build.xml b/icu4j/main/tests/core/build.xml index d83fa4d6066..08d61018416 100644 --- a/icu4j/main/tests/core/build.xml +++ b/icu4j/main/tests/core/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/main/tests/framework/build.xml b/icu4j/main/tests/framework/build.xml index 0b92cdaf8d6..c6a4cc20341 100644 --- a/icu4j/main/tests/framework/build.xml +++ b/icu4j/main/tests/framework/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,4 +27,5 @@ + \ No newline at end of file diff --git a/icu4j/main/tests/localespi/build.xml b/icu4j/main/tests/localespi/build.xml index cb010ef0869..a954cd7e6f2 100644 --- a/icu4j/main/tests/localespi/build.xml +++ b/icu4j/main/tests/localespi/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,4 +27,5 @@ + \ No newline at end of file diff --git a/icu4j/main/tests/packaging/build.xml b/icu4j/main/tests/packaging/build.xml index 6ccec51886c..46606b2ab3a 100644 --- a/icu4j/main/tests/packaging/build.xml +++ b/icu4j/main/tests/packaging/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -22,10 +23,9 @@ - + - - + diff --git a/icu4j/main/tests/translit/build.xml b/icu4j/main/tests/translit/build.xml index 1546c6cd951..486a0aef18a 100644 --- a/icu4j/main/tests/translit/build.xml +++ b/icu4j/main/tests/translit/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,6 +27,8 @@ + + diff --git a/icu4j/tools/build/build.xml b/icu4j/tools/build/build.xml index d236cd4a08d..9a565bfcdd3 100644 --- a/icu4j/tools/build/build.xml +++ b/icu4j/tools/build/build.xml @@ -1,6 +1,6 @@ @@ -12,7 +12,8 @@ - + + @@ -26,4 +27,5 @@ + \ No newline at end of file diff --git a/icu4j/tools/misc/build.xml b/icu4j/tools/misc/build.xml index ddd98b69796..ab126a6e01c 100644 --- a/icu4j/tools/misc/build.xml +++ b/icu4j/tools/misc/build.xml @@ -1,6 +1,6 @@ @@ -12,9 +12,10 @@ - + + - + @@ -26,4 +27,5 @@ + \ No newline at end of file