ICU-13413 Java 7 migration in build scripts and eclipse project files

- Updated javac/javadoc source and target Java version to 1.7.
- Eclipse projects to use execution environment JavaSE-1.7.
- Replaced java6.bootclasspath with java7.bootclasspath.
- Removed pre-Java 7 conditional build targets.
- Deleted stylesheet for JDK6 build.

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 3c608774acf2c60930f14512da0d4f1902a096b4..7feccb481cc440dd6bfd179f0d0e6df879a0e631 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -86,10 +86,6 @@
     <property name="external-jars" value="lib"/>
 
     <!-- Java version check -->
-    <condition property="is.java6">
-        <matches string="${java.version}" pattern="1\.6\.\d.*"/>
-    </condition>
-
     <condition property="is.java7">
         <matches string="${java.version}" pattern="1\.7\.\d.*"/>
     </condition>
@@ -131,16 +127,10 @@
         </or>
     </condition>
 
-    <condition property="is.java6.plus">
-        <or>
-            <isset property="is.java6"/>
-            <isset property="is.java7.plus"/>
-        </or>
-    </condition>
     <fail message="The JDK version is too old or unknown.">
         <condition>
             <not>
-                <isset property="is.java6.plus"/>
+                <isset property="is.java7.plus"/>
             </not>
         </condition>
     </fail>
@@ -660,7 +650,7 @@
         </icu-junit>
     </target>
 
-    <target name="localespiCheck" if="is.java6.plus" depends="info, localespi, localespi-tests" description="Run the ICU4J Locale SPI test suite">
+    <target name="localespiCheck" depends="info, localespi, localespi-tests" description="Run the ICU4J Locale SPI test suite">
         <antcall target="_localespiCheck"/>
         <fail message="test failed" if="icu-junit-failure" />
     </target>
@@ -750,7 +740,7 @@
         <condition property="release.build.config.ok">
             <and>
                 <isset property="is.java8"/>
-                <isset property="java6.bootclasspath"/>
+                <isset property="java7.bootclasspath"/>
                 <isset property="jcite.libs"/>
             </and>
         </condition>
@@ -760,8 +750,8 @@
         <condition property="disp.is.java8" value="${java.version}" else="${java.version} - Must be 1.8!">
             <isset property="is.java8"/>
         </condition>
-        <condition property="disp.java6.bootclasspath" value="${java6.bootclasspath}" else="Not Defined!">
-            <isset property="java6.bootclasspath"/>
+        <condition property="disp.java7.bootclasspath" value="${java7.bootclasspath}" else="Not Defined!">
+            <isset property="java7.bootclasspath"/>
         </condition>
         <condition property="disp.jcite.libs" value="${jcite.libs}" else="Not Defined!">
             <isset property="jcite.libs"/>
@@ -769,8 +759,8 @@
 
         <echo message="################################################################"/>
         <echo message="[WARNING] Insufficient Build Configuration for ICU4J Release"/>
-        <echo message="JDK Tools Version:              ${disp.is.java8}"/>
-        <echo message="JRE 6 System Library Path:      ${disp.java6.bootclasspath}"/>
+        <echo message="JDK 8 Tools:                    ${disp.is.java8}"/>
+        <echo message="JRE 7 System Library Path:      ${disp.java7.bootclasspath}"/>
         <echo message="JCite Library Path:             ${disp.jcite.libs}"/>
         <echo message="################################################################"/>
     </target>
@@ -1192,11 +1182,7 @@
         <ant dir="${icu4j.langdata.dir}" inheritAll="false"/>
     </target>
 
-    <target name="localespi" if="is.java6.plus" description="Build Locale SPI classes">
-        <antcall target="_build-localespi"/>
-    </target>
-
-    <target name="_build-localespi" depends="core, collate, currdata, langdata, regiondata">
+    <target name="localespi" depends="core, collate, currdata, langdata, regiondata" description="Build Locale SPI classes">
         <ant dir="${icu4j.localespi.dir}" inheritAll="false"/>
     </target>
 
@@ -1232,11 +1218,7 @@
         </ant>
     </target>
 
-    <target name="localespi-tests" if="is.java6.plus" description="Build Locale SPI tests">
-        <antcall target="_build-localespi-tests"/>
-    </target>
-
-    <target name="_build-localespi-tests" depends="localespi, test-framework">
+    <target name="localespi-tests" depends="localespi, test-framework" description="Build Locale SPI tests">
         <ant dir="${icu4j.localespi-tests.dir}" inheritAll="false">
             <reference refid="junit.jars"/>
         </ant>
@@ -1270,7 +1252,7 @@
         <ant dir="${icu4j.tools.dir}" inheritAll="false"/>
     </target>
 
-    <target name="perf-tests" if="is.java6.plus" depends="core, charset, collate, tools" description="Build performance test classes">
+    <target name="perf-tests" depends="core, charset, collate, tools" description="Build performance test classes">
         <ant dir="${icu4j.perf-tests.dir}" inheritAll="false"/>
     </target>
 
@@ -1300,9 +1282,6 @@
     </target>
 
     <target name="_docsStyleSheet">
-        <condition property="docs.style.sheet" value="stylesheet6.css">
-            <isset property="is.java6"/>
-        </condition>
         <condition property="docs.style.sheet" value="stylesheet7.css">
             <isset property="is.java7"/>
         </condition>
@@ -1620,8 +1599,8 @@
 
     <!-- Release management targets -->
     <target name="checktags" depends="info, build-tools" description="Check API tags before release">
-        <javadoc source="1.6"
-                 bootclasspath="${java6.bootclasspath}"
+        <javadoc source="1.7"
+                 bootclasspath="${java7.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">
                 <include name="com/ibm/icu/lang/**"/>
@@ -1642,8 +1621,8 @@
 
     <target name="gatherapi" depends="info, build-tools" description="Run API database generator tool">
         <mkdir dir="${out.dir}"/>
-        <javadoc source="1.6"
-                 bootclasspath="${java6.bootclasspath}"
+        <javadoc source="1.7"
+                 bootclasspath="${java7.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">
                 <include name="com/ibm/icu/lang/**"/>
@@ -1688,8 +1667,8 @@
 
     <target name="gatherapiOld" depends="info, build-tools" description="Run API database generator tool (Pre Java 5 style)">
         <mkdir dir="${out.dir}"/>
-        <javadoc source="1.6"
-                 bootclasspath="${java6.bootclasspath}"
+        <javadoc source="1.7"
+                 bootclasspath="${java7.bootclasspath}"
                  encoding="${java.src.encoding}">
             <packageset dir="${icu4j.core.dir}/src">
                 <include name="com/ibm/icu/lang/**"/>

diff --git a/icu4j/demos/.classpath b/icu4j/demos/.classpath
index c15c97e9c5e606620952ac5449130c3e58c0be0e..ca50de2a68f15322765d5b78749985a4b781c75e 100644 (file)
--- a/icu4j/demos/.classpath
+++ b/icu4j/demos/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-charset"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit"/>

diff --git a/icu4j/demos/.settings/org.eclipse.jdt.core.prefs b/icu4j/demos/.settings/org.eclipse.jdt.core.prefs
index 8e21554758685cb3f7b20ffb0bf5799bd48faa8d..972f7086d5e8ef21b69fc3e0bede326c8a1478d4 100644 (file)
--- a/icu4j/demos/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/demos/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/charset/.classpath b/icu4j/main/classes/charset/.classpath
index 05655cd96e870726850be3ffd1bc3e1040a3cb4b..12d5a2fc07aacbff65f70973a532e6d802286c3d 100644 (file)
--- a/icu4j/main/classes/charset/.classpath
+++ b/icu4j/main/classes/charset/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs
index 1752c6af7f919e37881afa1749ec6e17c2a2c26b..b529c1fa03d52546c7dea56e0e7d9caa2c53d617 100644 (file)
--- a/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/collate/.classpath b/icu4j/main/classes/collate/.classpath
index dc19734b492c35c781e78157cb6bffafd6cab53f..434dcc99eb4930cf7f999595e7aa647dbf3048db 100644 (file)
--- a/icu4j/main/classes/collate/.classpath
+++ b/icu4j/main/classes/collate/.classpath
@@ -2,6 +2,6 @@
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs
index 615a283b1273ba19bed8773d5d553acb789780b4..8949ab0b8605aa866ba4a33cf15df21c146d57a3 100644 (file)
--- a/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/core/.classpath b/icu4j/main/classes/core/.classpath
index e91d67757b293f173580465121e154f9c1e46cba..49c6fd660502099ba3906ee544a63c9706590215 100644 (file)
--- a/icu4j/main/classes/core/.classpath
+++ b/icu4j/main/classes/core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/core/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/core/.settings/org.eclipse.jdt.core.prefs
index ecb1ce0f2f25f07ef4ea568573ed671a418586df..c486688f7eefea706cf09b9661e62055522a9e46 100644 (file)
--- a/icu4j/main/classes/core/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/core/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/currdata/.classpath b/icu4j/main/classes/currdata/.classpath
index 05655cd96e870726850be3ffd1bc3e1040a3cb4b..12d5a2fc07aacbff65f70973a532e6d802286c3d 100644 (file)
--- a/icu4j/main/classes/currdata/.classpath
+++ b/icu4j/main/classes/currdata/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/currdata/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/currdata/.settings/org.eclipse.jdt.core.prefs
index ecb1ce0f2f25f07ef4ea568573ed671a418586df..c486688f7eefea706cf09b9661e62055522a9e46 100644 (file)
--- a/icu4j/main/classes/currdata/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/currdata/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/langdata/.classpath b/icu4j/main/classes/langdata/.classpath
index 05655cd96e870726850be3ffd1bc3e1040a3cb4b..12d5a2fc07aacbff65f70973a532e6d802286c3d 100644 (file)
--- a/icu4j/main/classes/langdata/.classpath
+++ b/icu4j/main/classes/langdata/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/langdata/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/langdata/.settings/org.eclipse.jdt.core.prefs
index ecb1ce0f2f25f07ef4ea568573ed671a418586df..c486688f7eefea706cf09b9661e62055522a9e46 100644 (file)
--- a/icu4j/main/classes/langdata/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/langdata/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/localespi/.classpath b/icu4j/main/classes/localespi/.classpath
index b387bd4da37fdf9c82e597ae8b1245f9ab7aa549..5bebb834e69c181da18a201136e543e1d242b106 100644 (file)
--- a/icu4j/main/classes/localespi/.classpath
+++ b/icu4j/main/classes/localespi/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/localespi/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/localespi/.settings/org.eclipse.jdt.core.prefs
index 03493e369dafab017897e349512d3029de7149c5..0ed3f02750688003e8916b38da0360c55b27753f 100644 (file)
--- a/icu4j/main/classes/localespi/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/localespi/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -168,9 +168,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

diff --git a/icu4j/main/classes/regiondata/.classpath b/icu4j/main/classes/regiondata/.classpath
index 05655cd96e870726850be3ffd1bc3e1040a3cb4b..12d5a2fc07aacbff65f70973a532e6d802286c3d 100644 (file)
--- a/icu4j/main/classes/regiondata/.classpath
+++ b/icu4j/main/classes/regiondata/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/regiondata/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/regiondata/.settings/org.eclipse.jdt.core.prefs
index ecb1ce0f2f25f07ef4ea568573ed671a418586df..c486688f7eefea706cf09b9661e62055522a9e46 100644 (file)
--- a/icu4j/main/classes/regiondata/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/regiondata/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/classes/translit/.classpath b/icu4j/main/classes/translit/.classpath
index dc19734b492c35c781e78157cb6bffafd6cab53f..434dcc99eb4930cf7f999595e7aa647dbf3048db 100644 (file)
--- a/icu4j/main/classes/translit/.classpath
+++ b/icu4j/main/classes/translit/.classpath
@@ -2,6 +2,6 @@
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs
index ecb1ce0f2f25f07ef4ea568573ed671a418586df..c486688f7eefea706cf09b9661e62055522a9e46 100644 (file)
--- a/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml
index 08bb05e399cfe497e4a2ed41a87b2354c97c888c..56ea12c546bc0c51701d33a72812ac20c001f997 100644 (file)
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -26,10 +26,10 @@
     <target name="@compile">
         <echo message="build-local:     ${global.build-local.properties}"/>
         <!-- set java 6 bootclasspath to empty if not set -->
-        <property name="java6.bootclasspath" value=""/>
+        <property name="java7.bootclasspath" value=""/>
 
-        <condition property="javac.bootclasspath" value="${java6.bootclasspath}" else="">
-            <equals arg1="${javac.target}" arg2="1.6"/>
+        <condition property="javac.bootclasspath" value="${java7.bootclasspath}" else="">
+            <equals arg1="${javac.target}" arg2="1.7"/>
         </condition>
 
         <echo message="--- java compiler arguments ------------------------"/>

diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 8c57be5f49457cd42991dcb1287257fe5b21d20d..06c6018a7ca06d2fb26f75a88b68d4df44ad9aac 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -9,7 +9,7 @@
 icu4j.spec.version = 62
 icu4j.impl.version = 62.1
 icu4j.data.version = 62
-default.exec.env = JavaSE-1.6
+default.exec.env = JavaSE-1.7
 
 copyright = \u00A9 2016 and later: Unicode, Inc. and others. License & terms of use: http://www.unicode.org/copyright.html#License
 
@@ -20,8 +20,8 @@ bin.dir = ${out.dir}/bin
 jar.dir = ${out.dir}/lib
 
 # Default java compiler options
-javac.source = 1.6
-javac.target = 1.6
+javac.source = 1.7
+javac.target = 1.7
 javac.debug = on
 javac.compilerarg = -Xlint:none
 java.src.encoding = UTF-8

diff --git a/icu4j/main/tests/charset/.classpath b/icu4j/main/tests/charset/.classpath
index dff5e037d09e3d3ae65be9d596991fba7e994471..fb8116ee4cffc93ea5ae07fa96820976840ecd76 100644 (file)
--- a/icu4j/main/tests/charset/.classpath
+++ b/icu4j/main/tests/charset/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-charset"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>

diff --git a/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs
index 780cfec2ee5210095c1de4c0db18958029bbf1b0..7dd4214dd998b80626b950393af0126b02e19e5b 100644 (file)
--- a/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -97,7 +97,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/tests/collate/.classpath b/icu4j/main/tests/collate/.classpath
index 4c02c6968528ff06e2d621976a8b10ccb0998ade..d7e3619ddf1425c1490cead344e546207ed71b52 100644 (file)
--- a/icu4j/main/tests/collate/.classpath
+++ b/icu4j/main/tests/collate/.classpath
@@ -4,7 +4,7 @@
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-currdata"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-regiondata"/>

diff --git a/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs
index 7904873b810b93a3cfd27cf806f39eb7bb12b7a7..95f2c48b69c1a1bb32f15401807b268f363f2450 100644 (file)
--- a/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -97,7 +97,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/tests/core/.classpath b/icu4j/main/tests/core/.classpath
index aa8de0234921ac31d0df22a3af61b6d2568c9e94..e02ee9d41d0a73e4c22d67427be7dc84ffe6e6c2 100644 (file)
--- a/icu4j/main/tests/core/.classpath
+++ b/icu4j/main/tests/core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>

diff --git a/icu4j/main/tests/core/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/core/.settings/org.eclipse.jdt.core.prefs
index 2369afdba98a85cbe31c1be2a8321ae522db73c8..5754d200af3a1640427ba4f209f0d65da08f2d01 100644 (file)
--- a/icu4j/main/tests/core/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/core/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/tests/framework/.classpath b/icu4j/main/tests/framework/.classpath
index 55efa79e1611210d50d35ecf95d3c8fc10d4448d..cc1f94af8ca6df092f2c7214edc27c8083ee3478 100644 (file)
--- a/icu4j/main/tests/framework/.classpath
+++ b/icu4j/main/tests/framework/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="lib" path="/external-libraries/hamcrest-core-1.3.jar"/>
        <classpathentry kind="lib" path="/external-libraries/junit-4.12.jar" sourcepath="/external-libraries/junit-4.12-sources.jar">
                <attributes>

diff --git a/icu4j/main/tests/framework/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/framework/.settings/org.eclipse.jdt.core.prefs
index 76b45e06cf98abfb9f3fda57d5c90d3cc61c8f48..fb4c8f6bc1a0f1744400d023211d00634e27ec2f 100644 (file)
--- a/icu4j/main/tests/framework/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/framework/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/tests/localespi/.classpath b/icu4j/main/tests/localespi/.classpath
index d6503bd010968b4198a8ee0e9d772e4b324f4909..1501ba646f623825aeab82a97c1aecf738a5706d 100644 (file)
--- a/icu4j/main/tests/localespi/.classpath
+++ b/icu4j/main/tests/localespi/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-localespi"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>

diff --git a/icu4j/main/tests/localespi/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/localespi/.settings/org.eclipse.jdt.core.prefs
index 719355647adf41c8b3cd514cf264dc473554e407..259d074c252bcc3e61cb534144cd44e88f9c330e 100644 (file)
--- a/icu4j/main/tests/localespi/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/localespi/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -168,9 +168,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

diff --git a/icu4j/main/tests/packaging/.classpath b/icu4j/main/tests/packaging/.classpath
index 81a195048d78a56eb4eda1675c142f7ef683ea73..a4e935a5e3bd21e16f43018f1cffa79b64fec3b8 100644 (file)
--- a/icu4j/main/tests/packaging/.classpath
+++ b/icu4j/main/tests/packaging/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry excluding="**/.svn/" kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
        <classpathentry kind="lib" path="/external-libraries/hamcrest-core-1.3.jar"/>

diff --git a/icu4j/main/tests/packaging/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/packaging/.settings/org.eclipse.jdt.core.prefs
index 2369afdba98a85cbe31c1be2a8321ae522db73c8..5754d200af3a1640427ba4f209f0d65da08f2d01 100644 (file)
--- a/icu4j/main/tests/packaging/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/packaging/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/main/tests/translit/.classpath b/icu4j/main/tests/translit/.classpath
index 7b12e78a045409b4d1414af879af026fed47dafa..96a06d806182a954d70b87d4a993420cd059d13f 100644 (file)
--- a/icu4j/main/tests/translit/.classpath
+++ b/icu4j/main/tests/translit/.classpath
@@ -4,7 +4,7 @@
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>
        <classpathentry kind="lib" path="/external-libraries/hamcrest-core-1.3.jar"/>
        <classpathentry kind="lib" path="/external-libraries/junit-4.12.jar" sourcepath="/external-libraries/junit-4.12-sources.jar">

diff --git a/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs
index d57efd451532a3b85ac42bbe6378166a67c105bd..6e3c8d7a03eafb36937e6f96ba28be8265e88a48 100644 (file)
--- a/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/perf-tests/.classpath b/icu4j/perf-tests/.classpath
index c0382e1908657044cfd0484e26f0ea84c9991f45..c6d8649e154eae15c6a3dacd1aae32191703b63a 100644 (file)
--- a/icu4j/perf-tests/.classpath
+++ b/icu4j/perf-tests/.classpath
@@ -8,6 +8,6 @@
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-regiondata"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-tools"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

diff --git a/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs b/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
index fc1382af588c770e956fd06b223813eb1fb1277d..fee21e5e6e02b0d8fce4ac029b2e55c49d7d06e4 100644 (file)
--- a/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -70,7 +70,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -142,9 +142,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

diff --git a/icu4j/perf-tests/build.properties b/icu4j/perf-tests/build.properties
index 5b08aea3689833c6a7b6e9a402e1d3b4b2aa30ed..7d968e5958d3659b417fbdfad1ad7d494afed8bf 100644 (file)
--- a/icu4j/perf-tests/build.properties
+++ b/icu4j/perf-tests/build.properties
@@ -6,5 +6,5 @@
 #*******************************************************************************
 shared.dir = ../main/shared
 
-javac.source = 1.6
-javac.target = 1.6
\ No newline at end of file
+javac.source = 1.7
+javac.target = 1.7
\ No newline at end of file

diff --git a/icu4j/samples/.classpath b/icu4j/samples/.classpath
index 77ceac241fd6e20a041aed8a2f0032e05620df5a..000abec7e547ec08d7bcacdf5294c4ac33352a3e 100644 (file)
--- a/icu4j/samples/.classpath
+++ b/icu4j/samples/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ICU_JAR"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>

diff --git a/icu4j/samples/.settings/org.eclipse.jdt.core.prefs b/icu4j/samples/.settings/org.eclipse.jdt.core.prefs
index f5db98f8005ed32e27c7f41c45916a05e40c14cd..74e560084dcc0a7ff036e2b1b3bb913f1996e95d 100644 (file)
--- a/icu4j/samples/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/samples/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -109,7 +109,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

diff --git a/icu4j/stylesheet6.css b/icu4j/stylesheet6.css
deleted file mode 100644 (file)
index 7276704..0000000
--- a/icu4j/stylesheet6.css
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * © 2016 and later: Unicode, Inc. and others.
- * License & terms of use: http://www.unicode.org/copyright.html#License
- *******************************************************************************
- * Copyright (C) 2011, International Business Machines Corporation and         *
- * others. All Rights Reserved.                                                *
- *******************************************************************************
- */
-
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF; color:#000000 }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
-.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-
-
-
-/* ICU modified JCite styles */
-pre.java /* container for citations */
-    {
-    border-style: solid;
-    border-width: 1px;
-    border-color: DarkGray;
-    margin: 1.5em 1.5em 1.5em 1.5em;
-    background-color: cornsilk;
-    }
-
-tt.java /* single cited line in JCite's -tt mode */
-    {
-    border-style: solid;
-    border-width: 1px;
-    border-color: DarkGray;
-    margin: 1.5em 1.5em 1.5em 1.5em;
-    background-color: cornsilk;
-    }
-
-span.j-blk /* block comment */
-{
-    color: DarkGreen;
-}
-
-span.j-cmt /* line comment */
-{
-    color: DarkGreen;
-}
-
-span.j-key /* keyword */
-{
-    /* font-weight:bold; */
-    color: Purple;
-    font-weight: bold;
-}
-
-span.j-str /* string constants */
-{
-    color: Blue;
-}
-
-span.j-chr /* char constants */
-{
-    color: Blue;
-}
-
-span.j-num /* number constants */
-{
-}
-
-span.j-sym /* symbols, punctuation */
-{
-}
-
-span.j-typ /* primitive types */
-{
-    color: Purple;
-    font-weight: bold;
-}
-
-span.j-jdoc /* javadoc */
-{
-    color: DarkSlateBlue;
-}
-
-span.j-jdoc-key /* javadoc keyword */
-{
-    color: MediumSlateBlue;
-    font-weight: bold;
-}
-
-span.j-jdoc-html /* javadoc html tag */
-{
-    color: SlateGray;
-}
-
-span.j-jdoc-link /* javadoc link */
-{
-    color: Blue;
-}
-
-span.j-undef /* undefined */
-{
-}
-
-span.j-hl /* highlight */
-{
-    text-decoration: none;
-    background-color: #FFFFB0;
-}

diff --git a/icu4j/tools/build/build.xml b/icu4j/tools/build/build.xml
index 15d458e65990b5c7909a20d4fab97a8ba96f73dd..70e3154de8d8bf14760eecb0745f98e1af100749 100644 (file)
--- a/icu4j/tools/build/build.xml
+++ b/icu4j/tools/build/build.xml
@@ -13,7 +13,6 @@
     <!-- before importing common-targets.xml -->
     <condition property="alt.src.dir" value="out/tmp-src-pre8">
         <or>
-            <equals arg1="${ant.java.version}" arg2="1.6"/>
             <equals arg1="${ant.java.version}" arg2="1.7"/>
         </or>
     </condition>

diff --git a/icu4j/tools/misc/.classpath b/icu4j/tools/misc/.classpath
index adc2566dc1558b3982503b642eacedfa214de05d..3ae236d9f9b97bab13e34adcbc3b9bc43520b0d6 100644 (file)
--- a/icu4j/tools/misc/.classpath
+++ b/icu4j/tools/misc/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit-tests"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit"/>

diff --git a/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs b/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs
index 8e21554758685cb3f7b20ffb0bf5799bd48faa8d..972f7086d5e8ef21b69fc3e0bede326c8a1478d4 100644 (file)
--- a/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,7 +96,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16