]> granicus.if.org Git - icu/commitdiff
projects / icu / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e16c565)
ICU-13358 Updated ICU version for 60rc.
authorYoshito Umaoka <y.umaoka@gmail.com>
Thu, 28 Sep 2017 21:31:29 +0000 (21:31 +0000)
committerYoshito Umaoka <y.umaoka@gmail.com>
Thu, 28 Sep 2017 21:31:29 +0000 (21:31 +0000)
X-SVN-Rev: 40503

icu4c/source/common/unicode/uvernum.h patch | blob | history
icu4j/build.properties patch | blob | history
icu4j/eclipse-build/build.properties patch | blob | history
icu4j/eclipse-build/misc/about_icu.html patch | blob | history
icu4j/eclipse-build/misc/about_icu_base.html patch | blob | history
icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java patch | blob | history
icu4j/main/shared/build/common.properties patch | blob | history
icu4j/main/shared/data/icudata.jar patch | blob | history
icu4j/main/shared/data/icutzdata.jar patch | blob | history
icu4j/main/shared/data/testdata.jar patch | blob | history
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java patch | blob | history

diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index 4dcc119aafbc807373a1fc26b377d2eb60f59c6a..71d9d26d664493a7514c056e7e9624c9f1760ee0 100644 (file)
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -119,7 +119,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION "60.0.1"
+#define U_ICU_VERSION "60.1"
 
 /** The current ICU library major/minor version as a string without dots, for library name suffixes.
  *  This value will change in the subsequent releases of ICU
@@ -136,7 +136,7 @@
 /** Data version in ICU4C.
  * @internal ICU 4.4 Internal Use Only
  **/
-#define U_ICU_DATA_VERSION "60.0.1"
+#define U_ICU_DATA_VERSION "60.1"
 #endif  /* U_HIDE_INTERNAL_API */
 
 /*===========================================================================
diff --git a/icu4j/build.properties b/icu4j/build.properties
index 21fb7a0bc2567370ef82010009826760f34eb7e8..564fd33c3755314ddf566e838ab8b77dbd4cd8b4 100644 (file)
--- a/icu4j/build.properties
+++ b/icu4j/build.properties
@@ -6,7 +6,7 @@
 #*******************************************************************************
 api.report.version = 60
 api.report.prev.version = 59
-release.file.ver = 60m1
-api.doc.version = 60 Milestone 1
+release.file.ver = 60rc
+api.doc.version = 60 Release Candidate
 maven.pom.ver = 60.1
 
diff --git a/icu4j/eclipse-build/build.properties b/icu4j/eclipse-build/build.properties
index 057c509424283c3e5835871cbb9298ac19a7f3d8..b099ffc91c18c5cfc69248faa8e645432ddba746 100644 (file)
--- a/icu4j/eclipse-build/build.properties
+++ b/icu4j/eclipse-build/build.properties
@@ -4,6 +4,6 @@
 #* Copyright (C) 2010-2016, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
-icu4j.plugin.impl.version.string=60.0.1
+icu4j.plugin.impl.version.string=60.1.0
 copyright.eclipse=(C) 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html#License
 icu4j.data.version.number=60
diff --git a/icu4j/eclipse-build/misc/about_icu.html b/icu4j/eclipse-build/misc/about_icu.html
index 6b124a0650c8b0b3a39818eed217610543e3888c..bbd28d92e117e104a0faa644f0161294920e414c 100644 (file)
--- a/icu4j/eclipse-build/misc/about_icu.html
+++ b/icu4j/eclipse-build/misc/about_icu.html
@@ -9,7 +9,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>April 11, 2017</p>
+<p>September 28, 2017</p>
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -32,7 +32,7 @@ did not receive this Content directly from the Eclipse Foundation, the following
 for informational purposes only, and you should look to the Redistributor's license for 
 terms and conditions of use.</p>
 
-<p><strong>ICU4J 59.1.0 plug-in</strong></p>
+<p><strong>ICU4J 60.1.0 plug-in</strong></p>
 
 <p>The plug-in includes software (&quot;ICU4J&quot;) developed by Unicode Inc. and others.
 Your use of ICU4J is subject to the terms and conditions of the ICU license.  A copy of the
diff --git a/icu4j/eclipse-build/misc/about_icu_base.html b/icu4j/eclipse-build/misc/about_icu_base.html
index 84304bc33814aeec2c654291013c335d6c2f0dad..077f193e6e23b0ff919823a8f960fab377ef84de 100644 (file)
--- a/icu4j/eclipse-build/misc/about_icu_base.html
+++ b/icu4j/eclipse-build/misc/about_icu_base.html
@@ -9,7 +9,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
  
-<p>April 11, 2017</p>
+<p>September 28, 2017</p>
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -32,7 +32,7 @@ did not receive this Content directly from the Eclipse Foundation, the following
 for informational purposes only, and you should look to the Redistributor's license for 
 terms and conditions of use.</p>
 
-<p><strong>ICU4J 59.1.0 base plug-in</strong></p>
+<p><strong>ICU4J 60.1.0 base plug-in</strong></p>
 
 <p>The plug-in includes software (&quot;ICU4J&quot;) developed by Unicode Inc. and others.
 Your use of ICU4J is subject to the terms and conditions of the ICU license.  A copy of the
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index e8495dc80a429e63f78e7d62208081e8d748bf65..df08d7c636043b2418579fd2ff0c98371901410c 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -567,7 +567,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
         UNICODE_9_0   = getInstance(9, 0, 0, 0);
         UNICODE_10_0   = getInstance(10, 0, 0, 0);
 
-        ICU_VERSION   = getInstance(60, 0, 1, 0);
+        ICU_VERSION   = getInstance(60, 1, 0, 0);
         ICU_DATA_VERSION = getInstance(60, 0, 1, 0);
         UNICODE_VERSION = UNICODE_10_0;
 
diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index cfa1325156e2d10a168ec12189918ed94722de99..a8f1ed986654480d92489d15e829a1054d4652c9 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -7,7 +7,7 @@
 
 # Version numbers, etc.
 icu4j.spec.version = 60
-icu4j.impl.version = 60.0.1
+icu4j.impl.version = 60.1
 icu4j.data.version = 60
 default.exec.env = JavaSE-1.6
 
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index eb4b0962c70b15c96f0c0ec70f9f02fd6a8556a2..532c87f4a5a367559528ab1384f8239344d48777 100755 (executable)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51415ea07a660b3ed68de8bcaaf30ec6afc8b045b1093d76f04294d7f68dba63
-size 12523451
+oid sha256:fa380dbb6eb790bf1eb09220e5da406e46a6f002f93e86204c03f80b0b47a4b8
+size 12523613
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 56c0a446fc09d84d055b5bba7aac9d47f246bc68..9e5da5bc1366056b889336679416dbec0bf951af 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b262a7c38087514a6f5efd4ef94b2adcaa513fbc1a9079e071c39460d28c817
+oid sha256:022ba49e93f865db59c7cb0efcbabbf96aa5b55b810cfcf66be7db45e9d8c657
 size 92486
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 64cd9ce4fcb6d143bb2396b51f1f4453077f6b4f..d89454b200b4ef01e5642f9e3e5e82be9bf1b228 100755 (executable)
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d9f9ca1a6277029785965df6eca2cd448315729a5505455283def4b0c45f430
-size 813103
+oid sha256:f4e026e2d5caa62d10da7894163db45ac0fa806e93dcf307771b6cc202a1f502
+size 813106
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
index 7f300aa4fc70b69917f9b07d311dc04cfaccec85..e31b83f503eafd618921331ec37b1157a0fe545a 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
@@ -10,7 +10,7 @@
 package com.ibm.icu.dev.test.util;
 
 public class DebugUtilitiesData extends Object {
-    public static final String ICU4C_VERSION="60.0.1";
+    public static final String ICU4C_VERSION="60.1";
     public static final int UDebugEnumType = 0;
     public static final int UCalendarDateFields = 1;
     public static final int UCalendarMonths = 2;
Unnamed repository; edit this file 'description' to name the repository.