diff --git a/icu4j/build.xml b/icu4j/build.xml
index 3c608774acf..7feccb481cc 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -86,10 +86,6 @@
-
-
-
-
@@ -131,16 +127,10 @@
-
-
-
-
-
-
-
+
@@ -660,7 +650,7 @@
-
+
@@ -750,7 +740,7 @@
-
+
@@ -760,8 +750,8 @@
-
-
+
+
@@ -769,8 +759,8 @@
-
-
+
+
@@ -1192,11 +1182,7 @@
-
-
-
-
-
+
@@ -1232,11 +1218,7 @@
-
-
-
-
-
+
@@ -1270,7 +1252,7 @@
-
+
@@ -1300,9 +1282,6 @@
-
-
-
@@ -1620,8 +1599,8 @@
-
@@ -1642,8 +1621,8 @@
-
@@ -1688,8 +1667,8 @@
-
diff --git a/icu4j/demos/.classpath b/icu4j/demos/.classpath
index c15c97e9c5e..ca50de2a68f 100644
--- a/icu4j/demos/.classpath
+++ b/icu4j/demos/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/icu4j/demos/.settings/org.eclipse.jdt.core.prefs b/icu4j/demos/.settings/org.eclipse.jdt.core.prefs
index 8e215547586..972f7086d5e 100644
--- 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 05655cd96e8..12d5a2fc07a 100644
--- a/icu4j/main/classes/charset/.classpath
+++ b/icu4j/main/classes/charset/.classpath
@@ -1,7 +1,7 @@
-
+
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 1752c6af7f9..b529c1fa03d 100644
--- 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 dc19734b492..434dcc99eb4 100644
--- a/icu4j/main/classes/collate/.classpath
+++ b/icu4j/main/classes/collate/.classpath
@@ -2,6 +2,6 @@
-
+
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 615a283b127..8949ab0b860 100644
--- 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 e91d67757b2..49c6fd66050 100644
--- a/icu4j/main/classes/core/.classpath
+++ b/icu4j/main/classes/core/.classpath
@@ -1,6 +1,6 @@
-
+
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 ecb1ce0f2f2..c486688f7ee 100644
--- 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 05655cd96e8..12d5a2fc07a 100644
--- a/icu4j/main/classes/currdata/.classpath
+++ b/icu4j/main/classes/currdata/.classpath
@@ -1,7 +1,7 @@
-
+
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 ecb1ce0f2f2..c486688f7ee 100644
--- 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 05655cd96e8..12d5a2fc07a 100644
--- a/icu4j/main/classes/langdata/.classpath
+++ b/icu4j/main/classes/langdata/.classpath
@@ -1,7 +1,7 @@
-
+
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 ecb1ce0f2f2..c486688f7ee 100644
--- 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 b387bd4da37..5bebb834e69 100644
--- a/icu4j/main/classes/localespi/.classpath
+++ b/icu4j/main/classes/localespi/.classpath
@@ -2,7 +2,7 @@
-
+
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 03493e369da..0ed3f027506 100644
--- 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 05655cd96e8..12d5a2fc07a 100644
--- a/icu4j/main/classes/regiondata/.classpath
+++ b/icu4j/main/classes/regiondata/.classpath
@@ -1,7 +1,7 @@
-
+
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 ecb1ce0f2f2..c486688f7ee 100644
--- 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 dc19734b492..434dcc99eb4 100644
--- a/icu4j/main/classes/translit/.classpath
+++ b/icu4j/main/classes/translit/.classpath
@@ -2,6 +2,6 @@
-
+
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 ecb1ce0f2f2..c486688f7ee 100644
--- 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 08bb05e399c..56ea12c546b 100644
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -26,10 +26,10 @@
-
+
-
-
+
+
diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 8c57be5f494..06c6018a7ca 100644
--- 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 dff5e037d09..fb8116ee4cf 100644
--- a/icu4j/main/tests/charset/.classpath
+++ b/icu4j/main/tests/charset/.classpath
@@ -1,7 +1,7 @@
-
+
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 780cfec2ee5..7dd4214dd99 100644
--- 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 4c02c696852..d7e3619ddf1 100644
--- a/icu4j/main/tests/collate/.classpath
+++ b/icu4j/main/tests/collate/.classpath
@@ -4,7 +4,7 @@
-
+
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 7904873b810..95f2c48b69c 100644
--- 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 aa8de023492..e02ee9d41d0 100644
--- a/icu4j/main/tests/core/.classpath
+++ b/icu4j/main/tests/core/.classpath
@@ -1,7 +1,7 @@
-
+
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 2369afdba98..5754d200af3 100644
--- 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 55efa79e161..cc1f94af8ca 100644
--- a/icu4j/main/tests/framework/.classpath
+++ b/icu4j/main/tests/framework/.classpath
@@ -2,7 +2,7 @@
-
+
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 76b45e06cf9..fb4c8f6bc1a 100644
--- 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 d6503bd0109..1501ba646f6 100644
--- a/icu4j/main/tests/localespi/.classpath
+++ b/icu4j/main/tests/localespi/.classpath
@@ -1,7 +1,7 @@
-
+
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 719355647ad..259d074c252 100644
--- 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 81a195048d7..a4e935a5e3b 100644
--- a/icu4j/main/tests/packaging/.classpath
+++ b/icu4j/main/tests/packaging/.classpath
@@ -1,7 +1,7 @@
-
+
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 2369afdba98..5754d200af3 100644
--- 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 7b12e78a045..96a06d80618 100644
--- a/icu4j/main/tests/translit/.classpath
+++ b/icu4j/main/tests/translit/.classpath
@@ -4,7 +4,7 @@
-
+
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 d57efd45153..6e3c8d7a03e 100644
--- 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 c0382e19086..c6d8649e154 100644
--- a/icu4j/perf-tests/.classpath
+++ b/icu4j/perf-tests/.classpath
@@ -8,6 +8,6 @@
-
+
diff --git a/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs b/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
index fc1382af588..fee21e5e6e0 100644
--- 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 5b08aea3689..7d968e5958d 100644
--- 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 77ceac241fd..000abec7e54 100644
--- a/icu4j/samples/.classpath
+++ b/icu4j/samples/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/icu4j/samples/.settings/org.eclipse.jdt.core.prefs b/icu4j/samples/.settings/org.eclipse.jdt.core.prefs
index f5db98f8005..74e560084dc 100644
--- 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
index 72767045684..00000000000
--- 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 15d458e6599..70e3154de8d 100644
--- a/icu4j/tools/build/build.xml
+++ b/icu4j/tools/build/build.xml
@@ -13,7 +13,6 @@
-
diff --git a/icu4j/tools/misc/.classpath b/icu4j/tools/misc/.classpath
index adc2566dc15..3ae236d9f9b 100644
--- a/icu4j/tools/misc/.classpath
+++ b/icu4j/tools/misc/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs b/icu4j/tools/misc/.settings/org.eclipse.jdt.core.prefs
index 8e215547586..972f7086d5e 100644
--- 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