From 63bb1c6e6f58407d859ab080128266d2969a9941 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Fri, 6 May 2011 18:39:47 +0000
Subject: [PATCH] ICU-8429 Update ICU4J version to 4.8 / 4.8RC except data
 version.

X-SVN-Rev: 30047
---
 icu4j/build.properties                                    | 6 +++---
 .../classes/core/src/com/ibm/icu/util/VersionInfo.java    | 2 +-
 icu4j/main/shared/build/common.properties                 | 4 ++--
 .../src/com/ibm/icu/dev/test/search/SearchTest.java       | 4 ++--
 .../ibm/icu/dev/test/format/DateTimeGeneratorTest.java    | 2 +-
 icu4j/pom.xml                                             | 8 ++++++++
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/icu4j/build.properties b/icu4j/build.properties
index 7d76f3194a4..1b169d053ac 100644
--- a/icu4j/build.properties
+++ b/icu4j/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 = 471
+api.report.version = 48
 api.report.prev.version = 46
-release.file.ver = 4_7_1
+release.file.ver = 4_8_rc1
 
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 4bf6bd10a5f..6d52c5cef49 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -488,7 +488,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
         UNICODE_5_2   = getInstance(5, 2, 0, 0);
         UNICODE_6_0   = getInstance(6, 0, 0, 0);
 
-        ICU_VERSION   = getInstance(4, 7, 1, 0);
+        ICU_VERSION   = getInstance(4, 8, 0, 0);
         ICU_DATA_VERSION = getInstance(4, 7, 1, 0);
         UNICODE_VERSION = UNICODE_6_0;
 
diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 74f9059379c..84d799c5a64 100644
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -4,8 +4,8 @@
 #*******************************************************************************
 
 # Version numbers, etc.
-icu4j.spec.version = 4.7
-icu4j.impl.version = 4.7.1
+icu4j.spec.version = 4.8
+icu4j.impl.version = 4.8
 icu4j.data.version = 47
 current.year = 2011
 default.exec.env = J2SE-1.5
diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
index 70dc3027103..ada6af6a44a 100644
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/search/SearchTest.java
@@ -1790,7 +1790,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementary() {
-        if (skipIfBeforeICU(4, 7, 1)) {
+        if (skipIfBeforeICU(4,9,0)) { // ticket#8080
             return;
         }
         int count = 0;
@@ -1803,7 +1803,7 @@ public class SearchTest extends TestFmwk {
     }
 
     public void TestSupplementaryCanonical() {
-        if (skipIfBeforeICU(4, 7, 1)) {
+        if (skipIfBeforeICU(4,9,0)) { // ticket#8080
             return;
         }
         int count = 0;
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
index aabe305d80e..51a17d2c79c 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java
@@ -525,7 +525,7 @@ public class DateTimeGeneratorTest extends TestFmwk {
         DateOrder order2 = getOrdering(style2, uLocale);
         if (!order1.hasSameOrderAs(order2)) {
             if (order1.monthLength == order2.monthLength) { // error if have same month length, different ordering
-                if (skipIfBeforeICU(4,7,1)) { // ticket#6806
+                if (skipIfBeforeICU(4,9,0)) { // ticket#6806
                     logln(showOrderComparison(uLocale, style1, style2, order1, order2));
                 } else {
                     errln(showOrderComparison(uLocale, style1, style2, order1, order2));
diff --git a/icu4j/pom.xml b/icu4j/pom.xml
index 881336be48a..df047beedca 100644
--- a/icu4j/pom.xml
+++ b/icu4j/pom.xml
@@ -77,6 +77,14 @@
         <role>PMC Member</role>
       </roles>
     </developer>
+    <developer>
+      <id>pedberg</id>
+      <name>Peter Edberg</name>
+      <organization>Apple</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
     <developer>
       <id>yoshito</id>
       <name>Yoshito Umaoka</name>