ICU-8287 Updated readme, version numbers in manifest and some others for ICU4J 4.6.1.
X-SVN-Rev: 29622
diff --git a/build.properties b/build.properties
index e861ab2..2b5a654 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,8 @@
#*******************************************************************************
-#* Copyright (C) 2009-2010, International Business Machines Corporation and *
+#* Copyright (C) 2009-2011, International Business Machines Corporation and *
#* others. All Rights Reserved. *
#*******************************************************************************
-api.report.version = 46
+api.report.version = 461
api.report.prev.version = 44
-release.file.ver = 4_6
+release.file.ver = 4_6_1
diff --git a/main/shared/build/common.properties b/main/shared/build/common.properties
index 7369ef2..a75a4f5 100644
--- a/main/shared/build/common.properties
+++ b/main/shared/build/common.properties
@@ -5,7 +5,7 @@
# Version numbers, etc.
icu4j.spec.version = 4.6
-icu4j.impl.version = 4.6
+icu4j.impl.version = 4.6.1
icu4j.data.version = 46
current.year = 2011
default.exec.env = J2SE-1.5
diff --git a/main/shared/licenses/license.html b/main/shared/licenses/license.html
index 7ae0252..1e2b1ab 100644
--- a/main/shared/licenses/license.html
+++ b/main/shared/licenses/license.html
@@ -11,7 +11,7 @@
<p>COPYRIGHT AND PERMISSION NOTICE</p>
<p>
-Copyright (c) 1995-2010 International Business Machines Corporation and others
+Copyright (c) 1995-2011 International Business Machines Corporation and others
</p>
<p>
All rights reserved.
diff --git a/main/shared/licenses/unicode-license.txt b/main/shared/licenses/unicode-license.txt
index 7452762..bf2c3a3 100644
--- a/main/shared/licenses/unicode-license.txt
+++ b/main/shared/licenses/unicode-license.txt
@@ -1,48 +1,50 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
Unicode Data Files include all data files under the directories
http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/ . Unicode Software includes any source code
-published in the Unicode Standard or under the directories
-http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/.
+http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
+online code charts under the directory http://www.unicode.org/Public/.
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
NOTICE TO USER: Carefully read the following legal agreement. BY
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
-AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU
-DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES
-OR SOFTWARE.
+AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF
+YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA
+FILES OR SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE
- Copyright © 1991-2010 Unicode, Inc. All rights reserved. Distributed under
+ Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under
the Terms of Use in http://www.unicode.org/copyright.html.
- Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and any associated documentation (the "Data Files") or
-Unicode software and any associated documentation (the "Software") to deal in
-the Data Files or Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files or
-Software are furnished to do so, provided that (a) the above copyright notice(s)
-and this permission notice appear with all copies of the Data Files or Software,
-(b) both the above copyright notice(s) and this permission notice appear in
-associated documentation, and (c) there is clear notice in each modified Data
-File or in the Software as well as in the documentation associated with the Data
-File(s) or Software that the data or software has been modified.
+ Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Unicode data files and any associated documentation (the "Data
+Files") or Unicode software and any associated documentation (the "Software")
+to deal in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute, and/or
+sell copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that (a) the above
+copyright notice(s) and this permission notice appear with all copies of the
+Data Files or Software, (b) both the above copyright notice(s) and this
+permission notice appear in associated documentation, and (c) there is clear
+notice in each modified Data File or in the Software as well as in the
+documentation associated with the Data File(s) or Software that the data or
+software has been modified.
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
-PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR
-SOFTWARE.
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
+DATA FILES OR SOFTWARE.
- Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
\ No newline at end of file
+ Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written authorization
+of the copyright holder.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c9bc0b9..b22ef02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
*******************************************************************************
-* Copyright (C) 2010, International Business Machines Corporation and *
+* Copyright (C) 2010-2011, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
-->
@@ -11,7 +11,7 @@
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
- <version>4.6</version>
+ <version>4.6.1</version>
<name>ICU4J</name>
<description>
diff --git a/readme.html b/readme.html
index 6af8527..5eb44cc 100644
--- a/readme.html
+++ b/readme.html
@@ -19,8 +19,9 @@
March 11, 2011<br>
</p>
-<p><b>Note:</b> ICU 4.6 is major release of ICU4J. It contains bug fixes and adds implementations
-of inherited API and introduces new API or functionality. ICU 4.6.1 contains additional bug fixes.
+<p><b>Note:</b> This is an update release of ICU4J 4.6. This release contains several
+bug fixes and updated data, but does not introduce any new APIs for functionalities.
+
</p>
<p>For the most recent release, see the <a
href="http://www.icu-project.org/download/"> ICU4J
@@ -127,11 +128,25 @@
<h3 class="doc"><a name="changes"></a>Changes In This Release</h3>
<h4>New features and changes</h4>
<p>
-See the <a href="http://sites.google.com/site/icusite/download/46">ICU 4.6 milestone download page</a> about
+See the <a href="http://sites.google.com/site/icusite/download/46">ICU 4.6 download page</a> about
new features in this release. The list of API changes since the previous ICU4J release
is available
<a href="http://source.icu-project.org/repos/icu/icu4j/tags/release-4-6/APIChangeReport.html">here</a>.
</p>
+
+<h4 class="doc">Summary of updates in 4.6.1 (March 11, 2011)</h4>
+<p><b>CLDR 1.9.1 updates</b>
+<p>ICU4J 4.6.1 imported locale data updates from <a href="http://cldr.unicode.org/index/downloads/cldr-1-9-1">CLDR
+1.9.1</a> release.
+
+<p><b>Time zone data update</b>
+<p>ICU4J 4.6.1 updates the time zone data to version <a href="http://source.icu-project.org/repos/icu/data/trunk/tzdata/icunew/2011c/44/">2011c</a>
+from the Olson tz database.
+
+<p><b>Bug fixes</b>
+<p>See the <a href="http://bugs.icu-project.org/trac/milestone/4.6.1">ICU Trac 4.6.1 page</a> about
+fixes done in this update release.
+
<h3 class="doc"><a name="license"></a>License Information</h3>
<p>
The ICU projects (ICU4C and ICU4J) use the X license. The X
@@ -952,9 +967,9 @@
<h5> Generating Data from CLDR </h5>
<I> Note: This procedure assumes that all 3 sources are present</I>
<ol>
- <li>Checkout or download CLDR version 1.9</li>
- <li>Checkout ICU4C with tag 'release-4-6'</li>
- <li>Checkout ICU4J with tag 'release-4-6'</li>
+ <li>Checkout or download CLDR version 1.9.1</li>
+ <li>Checkout ICU4C with tag 'release-4-6-1'</li>
+ <li>Checkout ICU4J with tag 'release-4-6-1'</li>
<li>cd to <I>$icu4c_root</I>/source/data directory</li>
<li>Follow the instructions in <I>$icu4c_root</I>/source/data/cldr-icu-readme.txt</li>
<li>Rebuild ICU4C with the newly generated data.</li>
@@ -966,7 +981,7 @@
</ol>
<h3 class="doc"><a name="timezone"></a>About ICU4J Time Zone</h3>
-<p>ICU4J 4.6 includes time zone data version 2010o, which is the latest one as of
+<p>ICU4J 4.6.1 includes time zone data version 2011c, which is the latest one as of
the release date. However, time zone data is frequently updated in response
to changes made by local governments around the world. If you need to update
the time zone data, please refer the ICU user guide topic
