From f3f355943b54b9d9054a178ddd6ab0fd05b343a2 Mon Sep 17 00:00:00 2001
From: Scott Russell <DTownSMR@gmail.com>
Date: Wed, 23 Sep 2015 22:01:29 +0000
Subject: [PATCH] ICU-11918 refresh API change report & API sig, fix for
 missing file for formatTests module test, and cleanup LocaleMatcher API
 change

X-SVN-Rev: 38017
---
 .gitattributes                                            | 1 +
 icu4j/APIChangeReport.html                                | 6 +++---
 icu4j/build.xml                                           | 3 +++
 .../classes/core/src/com/ibm/icu/util/LocaleMatcher.java  | 8 ++++++--
 icu4j/tools/build/icu4j56.api3.gz                         | 3 +++
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 icu4j/tools/build/icu4j56.api3.gz

diff --git a/.gitattributes b/.gitattributes
index 25e2d07c688..bc31d74c884 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -489,6 +489,7 @@ icu4j/tools/build/icu4j52.api3.gz -text
 icu4j/tools/build/icu4j53.api3.gz -text
 icu4j/tools/build/icu4j54.api3.gz -text
 icu4j/tools/build/icu4j55.api3.gz -text
+icu4j/tools/build/icu4j56.api3.gz -text
 tools/currency/.classpath -text
 tools/currency/.project -text
 tools/currency/.settings/org.eclipse.core.resources.prefs -text
diff --git a/icu4j/APIChangeReport.html b/icu4j/APIChangeReport.html
index 85ba84e7682..fa19ece53f9 100644
--- a/icu4j/APIChangeReport.html
+++ b/icu4j/APIChangeReport.html
@@ -430,12 +430,12 @@ MeasureUnit
 <ul>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit CENTURY</li>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit CUP_METRIC</li>
-<li><span style='color:orange'>(draft)</span> public static final MeasureUnit GENERIC</li>
+<li><span style='color:orange'>(draft)</span> public static final MeasureUnit GENERIC_TEMPERATURE</li>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit KNOT</li>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit LITER_PER_100KILOMETERS</li>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit MILE_SCANDINAVIAN</li>
 <li><span style='color:orange'>(draft)</span> public static final MeasureUnit PINT_METRIC</li>
-<li><span style='color:orange'>(draft)</span> public static final MeasureUnit REVOLUTION</li>
+<li><span style='color:orange'>(draft)</span> public static final MeasureUnit REVOLUTION_ANGLE</li>
 </ul>
 VersionInfo
 <ul>
@@ -444,6 +444,6 @@ VersionInfo
 </ul>
 
 <hr/>
-<p><i><font size="-1">Contents generated by ReportAPI tool on Wed Sep 23 00:44:12 EDT 2015<br/>Copyright (C) 2015, International Business Machines Corporation, All Rights Reserved.</font></i></p>
+<p><i><font size="-1">Contents generated by ReportAPI tool on Wed Sep 23 17:51:23 EDT 2015<br/>Copyright (C) 2015, International Business Machines Corporation, All Rights Reserved.</font></i></p>
 </body>
 </html>
diff --git a/icu4j/build.xml b/icu4j/build.xml
index e3c1d70d5f5..6ed672700cc 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -1678,6 +1678,9 @@
         <copy file="${icu4j.core-tests.dir}/src/com/ibm/icu/dev/test/format/NumberFormatTestCases.txt"
                 todir="${module.tests.dir}/com/ibm/icu/dev/test/format"/>
 
+        <copy file="${icu4j.core-tests.dir}/src/com/ibm/icu/dev/data/numberformattestspecification.txt"
+                todir="${module.tests.dir}/com/ibm/icu/dev/data"/>
+
     </target>
 
     <!-- Normalizer -->
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
index b19223810a8..b092a0abda0 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleMatcher.java
@@ -51,7 +51,9 @@ public class LocaleMatcher {
 
     /**
      * @internal
+     * @deprecated This API is ICU internal only.
      */
+    @Deprecated
     public static final boolean DEBUG = false;
 
     private static final ULocale UNKNOWN_LOCALE = new ULocale("und");
@@ -288,9 +290,11 @@ public class LocaleMatcher {
     }
     
     /**
-     * @internal
+     * @internal 
+     * @deprecated This API is ICU internal only.
      */
-    public static class OutputDouble { // TODO, move to where OutputInt is
+    @Deprecated
+    private static class OutputDouble { // TODO, move to where OutputInt is
         double value;
     }
 
diff --git a/icu4j/tools/build/icu4j56.api3.gz b/icu4j/tools/build/icu4j56.api3.gz
new file mode 100644
index 00000000000..0b9609f854e
--- /dev/null
+++ b/icu4j/tools/build/icu4j56.api3.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b22ae3478b673666491a636ff66d3087700360bdeb2b788b500924364761a038
+size 54679