ICU-12022 Updated the minimum JRE version to Java 6.

X-SVN-Rev: 38099

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 6ed672700cc8423f1f8a706521e29e94f19fc8be..0b5e58b26c217755406dab25736ef3ae19320541 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -53,7 +53,7 @@
     <property name="icu4j.api.doc.title" value="ICU4J ${api.doc.version} API Specification"/>
     <property name="icu4j.api.doc.window.title" value="ICU4J ${api.doc.version}"/>
     <property name="icu4j.api.doc.header" value="ICU4J ${api.doc.version}"/>
-    <property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/7/docs/api/"/>
+    <property name="icu4j.api.doc.jdk.link" value="http://docs.oracle.com/javase/8/docs/api/"/>
 
     <!-- directories -->
     <property name="release.dir" value="release"/>
@@ -67,19 +67,14 @@
             <contains string="${java.version}" substring="1.6."/>
             <contains string="${java.version}" substring="1.7."/>
             <contains string="${java.version}" substring="1.8."/>
+            <contains string="${java.version}" substring="1.9."/>
         </or>
     </condition>
-    <condition property="is.java5">
-        <contains string="${java.version}" substring="1.5."/>
-    </condition>
     <fail message="The JDK version is too old or unknown.">
         <condition>
             <not>
-                <or>
-                    <isset property="is.java6.plus"/>
-                    <isset property="is.java5"/>
-                </or>
-             </not>
+                <isset property="is.java6.plus"/>
+            </not>
         </condition>
     </fail>
 
@@ -436,7 +431,6 @@
         <condition property="release.build.config.ok">
             <and>
                 <isset property="is.java7"/>
-                <isset property="java5.bootclasspath"/>
                 <isset property="java6.bootclasspath"/>
                 <isset property="jcite.libs"/>
             </and>
@@ -447,10 +441,7 @@
         <condition property="disp.is.java7" value="${java.version}" else="${java.version} - Must be 1.7!">
             <isset property="is.java7"/>
         </condition>
-        <condition property="disp.java5.bootclasspath" value="${java5.bootclasspath}" else="Not Defined!">
-            <isset property="java5.bootclasspath"/>
-        </condition>
-        <condition property="disp.java6.bootclasspath" value="${java5.bootclasspath}" else="Not Defined!">
+        <condition property="disp.java6.bootclasspath" value="${java6.bootclasspath}" else="Not Defined!">
             <isset property="java6.bootclasspath"/>
         </condition>
         <condition property="disp.jcite.libs" value="${jcite.libs}" else="Not Defined!">
@@ -460,7 +451,6 @@
         <echo message="################################################################"/>
         <echo message="[WARNING] Insufficient Build Configuration for ICU4J Release"/>
         <echo message="JDK Tools Version:              ${disp.is.java7}"/>
-        <echo message="JRE 5 System Library Path:      ${disp.java5.bootclasspath}"/>
         <echo message="JRE 6 System Library Path:      ${disp.java6.bootclasspath}"/>
         <echo message="JCite Library Path:             ${disp.jcite.libs}"/>
         <echo message="################################################################"/>

diff --git a/icu4j/demos/.classpath b/icu4j/demos/.classpath
index c13960c4471f54f82199768f1ce95d0d4b5a81fd..c15c97e9c5e606620952ac5449130c3e58c0be0e 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 80422e5e9adccee88a33d5798892aa149ab2035b..8e21554758685cb3f7b20ffb0bf5799bd48faa8d 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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/eclipse-build/build-local.properties.template b/icu4j/eclipse-build/build-local.properties.template
index 77a940f55a00702c0a80673966db0fb1a946ca98..a567f4775e22de4154c6b5855cfb8af1b1d32f51 100644 (file)
--- a/icu4j/eclipse-build/build-local.properties.template
+++ b/icu4j/eclipse-build/build-local.properties.template
@@ -1,9 +1,8 @@
-#*******************************************************************************
-#* Copyright (C) 2014, International Business Machines Corporation and         *
-#* others. All Rights Reserved.                                                *
-#*******************************************************************************
+################################################################################
+# Copyright (C) 2014-2015, International Business Machines Corporation and
+# others. All Rights Reserved.
+################################################################################
 
-#
 # Eclipse installation location
 # Specify the folder that contains eclipse.exe, for example: eclipse.home=C:/eclipse
 #
@@ -14,26 +13,29 @@
 #eclipse.home=
 
 #
-# Java 5 runtime jar location
-# Specify jar file path(es) including J2SE runtime classes
+# Java 6 runtime jar location
+# Specify jar file path(es) including Java runtime classes.
 #
 # Note: 
-#
-#   [Oracle JDK]   All of J2SE runtime classes are in <JRE dir>/lib/rt.jar
-#
-#   [IBM JDK]      J2SE runtime classes are in multiple jar files. To build ICU4J
-#                  plug-in, you need followings:
-#                      - <JRE dir>/lib/vm.jar
-#                      - <JRE dir>/lib/core.jar
-#                      - <JRE dir>/lib/graphics.jar
-#                      - <JRE dir>/lib/xml.jar
-#
-# For example: java.rt=C:/ibmjava5/jre/lib/vm.jar;C:/ibmjava5/jre/lib/core.jar;C:/ibmjava5/jre/lib/graphics.jar;C:/ibmjava5/jre/lib/xml.jar
-#
-# NOTE:    slashes must be forward slashes. Backslashes will NOT work.
-#
-#                      IF java.rt variable has embedded space(s)...
-#          ...each element containing an embedded space java.rt must indivudually quoated and the elements separated by a semi-colon.
-#                 ex. "C:/Program Files/IBM/Java50JDK/jre/lib/vm.jar";"C:/Program Files/IBM/Java50JDK/jre/lib/core.jar"
-#                                                                   ^^^
-java.rt=
+#   Java runtime classes are stored in multiple jar files in modern JREs.
+#   To get the full list of jar files included in JRE, you can write a simple
+#   code printing system property "sun.boot.class.path".
+#
+# For example:
+#
+# java.rt=C:/ibmjre6/bin/default/jclSC160/vm.jar;C:/ibmjre6/lib/annotation.jar;C:/ibmjre6/lib/beans.jar;\
+#   C:/ibmjre6/lib/java.util.jar;C:/ibmjre6/lib/jndi.jar;C:/ibmjre6/lib/logging.jar;C:/ibmjre6/lib/security.jar;\
+#   C:/ibmjre6/lib/sql.jar;C:/ibmjre6/lib/ibmorb.jar;C:/ibmjre6/lib/ibmorbapi.jar;C:/ibmjre6/lib/ibmcfw.jar;\
+#   C:/ibmjre6/lib/rt.jar;C:/ibmjre6/lib/charsets.jar;C:/ibmjre6/lib/resources.jar;C:/ibmjre6/lib/ibmpkcs.jar;\
+#   C:/ibmjre6/lib/ibmcertpathfw.jar;C:/ibmjre6/lib/ibmjgssfw.jar;C:/ibmjre6/lib/ibmjssefw.jar;\
+#   C:/ibmjre6/lib/ibmsaslfw.jar;C:/ibmjre6/lib/ibmjcefw.jar;C:/ibmjre6/lib/ibmjgssprovider.jar;\
+#   C:/ibmjre6/lib/ibmjsseprovider2.jar;C:/ibmjre6/lib/ibmcertpathprovider.jar;C:/ibmjre6/lib/management-agent.jar;\
+#   C:/ibmjre6/lib/xml.jar;C:/ibmjre6/lib/jlm.jar;C:/ibmjre6/lib/javascript.jar
+#
+# NOTE: slashes must be forward slashes. Backslashes will NOT work as path separator.
+#
+# IF java.rt variable has embedded space(s)...
+#   ...each element containing an embedded space java.rt must individually quoted and the elements separated by a semi-colon.
+#   ex. "C:/Program Files/IBM/Java50JDK/jre/lib/vm.jar";"C:/Program Files/IBM/Java50JDK/jre/lib/core.jar"
+#                                                     ^^^
+#java.rt=

diff --git a/icu4j/eclipse-build/pdebuild/build.properties b/icu4j/eclipse-build/pdebuild/build.properties
index a1b10843ce79a10c8d8b58c60bda5eba5b27d1d8..f8eee66c86394cd671a72654e78cfa9cc5c9b042 100644 (file)
--- a/icu4j/eclipse-build/pdebuild/build.properties
+++ b/icu4j/eclipse-build/pdebuild/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003-2014 IBM Corporation and others.
+# Copyright (c) 2003-2015 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -188,8 +188,8 @@ skipFetch=true
 #J2SE-1.3=
 #J2SE-1.4=
 #J2SE-1.5=
-J2SE-1.5=@JAVA_RT@
 #JavaSE-1.6=
+JavaSE-1.6=@JAVA_RT@
 #PersonalJava-1.1=
 #PersonalJava-1.2=
 #CDC-1.0/PersonalBasis-1.0=
@@ -213,9 +213,9 @@ javacVerbose=true
 compilerArg=-inlineJSR -enableJavadoc -encoding UTF-8
 
 # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties
-javacSource=1.5
+javacSource=1.6
 
 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties.
-javacTarget=1.5
+javacTarget=1.6
 
 individualSourceBundles=true

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.classpath b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.classpath
index 304e86186aa0aecc956652a558f33921111ab213..121e527a9386dd66bdd0ec178fc2d28d734b82f8 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.classpath
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.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/J2SE-1.5"/>
+       <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.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/META-INF/MANIFEST.MF b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/META-INF/MANIFEST.MF
index cb977ea931719e84e8470baa47673db76e6cdce0..a91e9aa868be66c28df046a134030974e84c2061 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/META-INF/MANIFEST.MF
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Vendor: %providerName
 Fragment-Host: com.ibm.icu.base
 Bundle-Copyright: @COPYRIGHT@
 Require-Bundle: org.junit
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.classpath b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.classpath
index 304e86186aa0aecc956652a558f33921111ab213..121e527a9386dd66bdd0ec178fc2d28d734b82f8 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.classpath
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.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/J2SE-1.5"/>
+       <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.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF
index 3c025efd1e2fe7ab68e9ea77ece44f6205a11b6d..da032e4697eaa428a3c5596131f0fa97e7c9d5de 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Export-Package: com.ibm.icu.text;base=true;version="@IMPL_VERSION@",
  com.ibm.icu.impl;x-internal:=true,
  com.ibm.icu.impl.locale;x-internal:=true
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.classpath b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.classpath
index 304e86186aa0aecc956652a558f33921111ab213..121e527a9386dd66bdd0ec178fc2d28d734b82f8 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.classpath
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.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/J2SE-1.5"/>
+       <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.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF
index 05bc781b2d06ea5c3f7f5fbe8de0c1584ecc2787..39f383ed6c4faa4f9286bfda4b3f16965da3cb71 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Vendor: %providerName
 Fragment-Host: com.ibm.icu
 Bundle-Copyright: @COPYRIGHT@
 Require-Bundle: org.junit
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu/.classpath b/icu4j/eclipse-build/plugins.template/com.ibm.icu/.classpath
index 304e86186aa0aecc956652a558f33921111ab213..121e527a9386dd66bdd0ec178fc2d28d734b82f8 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu/.classpath
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu/.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/J2SE-1.5"/>
+       <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.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF b/icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF
index bcdd020cc15678e4808e9352d41f20b56888ac7a..a407ebeedc2ea1b262b832ec93f2e1601c78935d 100644 (file)
--- a/icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF
@@ -24,6 +24,6 @@ Export-Package: com.ibm.icu.lang;base=true;full=true;version="@IMPL_VERSION@",
  com.ibm.icu.impl.duration;x-internal:=true,
  com.ibm.icu.impl.locale;x-internal:=true
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: icu-data.jar,.
 Eclipse-ExtensibleAPI: true

diff --git a/icu4j/main/classes/charset/.classpath b/icu4j/main/classes/charset/.classpath
index f145b1f226d407f515143615fabedb0c8d85127a..05655cd96e870726850be3ffd1bc3e1040a3cb4b 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 94a6c68806db469d942e3011b7938947731659e4..1752c6af7f919e37881afa1749ec6e17c2a2c26b 100644 (file)
--- a/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/charset/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,10 @@ 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.5
+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.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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 +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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +182,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/collate/.classpath b/icu4j/main/classes/collate/.classpath
index e3b5e98518075425a7e1f4f3c7a8244982584471..dc19734b492c35c781e78157cb6bffafd6cab53f 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..615a283b1273ba19bed8773d5d553acb789780b4 100644 (file)
--- a/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/classes/collate/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,10 @@ 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.5
+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.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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 +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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +182,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/core/.classpath b/icu4j/main/classes/core/.classpath
index 6c678cf0cb6c07f082fe1075142ac83de6afa8cd..e91d67757b293f173580465121e154f9c1e46cba 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..ecb1ce0f2f25f07ef4ea568573ed671a418586df 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/currdata/.classpath b/icu4j/main/classes/currdata/.classpath
index f145b1f226d407f515143615fabedb0c8d85127a..05655cd96e870726850be3ffd1bc3e1040a3cb4b 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..ecb1ce0f2f25f07ef4ea568573ed671a418586df 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/langdata/.classpath b/icu4j/main/classes/langdata/.classpath
index f145b1f226d407f515143615fabedb0c8d85127a..05655cd96e870726850be3ffd1bc3e1040a3cb4b 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..ecb1ce0f2f25f07ef4ea568573ed671a418586df 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/localespi/build.properties b/icu4j/main/classes/localespi/build.properties
index bd06179c57e2f7c9da68293142b6d6e9f2fdfc3f..77f3b8679cdc6230bc753e2cf0110fe651ab5521 100644 (file)
--- a/icu4j/main/classes/localespi/build.properties
+++ b/icu4j/main/classes/localespi/build.properties
@@ -1,9 +1,6 @@
 #*******************************************************************************
-#* Copyright (C) 2009-2012, International Business Machines Corporation and    *
+#* Copyright (C) 2009-2015, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 shared.dir = ../../shared
-
-javac.source = 1.6
-javac.target = 1.6
 javac.compilerarg = -Xlint:all,-deprecation,-dep-ann,-options

diff --git a/icu4j/main/classes/regiondata/.classpath b/icu4j/main/classes/regiondata/.classpath
index f145b1f226d407f515143615fabedb0c8d85127a..05655cd96e870726850be3ffd1bc3e1040a3cb4b 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..ecb1ce0f2f25f07ef4ea568573ed671a418586df 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/translit/.classpath b/icu4j/main/classes/translit/.classpath
index e3b5e98518075425a7e1f4f3c7a8244982584471..dc19734b492c35c781e78157cb6bffafd6cab53f 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 6ab64f83d14269a6d369c35e1ce46e53a2b4ba09..ecb1ce0f2f25f07ef4ea568573ed671a418586df 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 80ac52b28cd6ce0972e6c9a13dff2fac05f05a48..5f4b9cefcf033add6e5ca5b01cf4b04cbbfd6623 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -8,7 +8,7 @@ icu4j.spec.version = 56
 icu4j.impl.version = 56.1
 icu4j.data.version = 56
 current.year = 2015
-default.exec.env = J2SE-1.5
+default.exec.env = JavaSE-1.6
 
 corp = IBM Corporation
 copyright = Copyright 2000-${current.year}, International Business Machines Corporation and others.  All Rights Reserved.
@@ -20,8 +20,8 @@ bin.dir = ${out.dir}/bin
 jar.dir = ${out.dir}/lib
 
 # Default java compiler options
-javac.source = 1.5
-javac.target = 1.5
+javac.source = 1.6
+javac.target = 1.6
 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 b7128f491fb409cf1150b3f26835a88b436c06c2..279c3d233fdfc318575603f54c2ace8aefe72a7a 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 4725b5d257b9fb686222c344f304e89b5a9948bd..780cfec2ee5210095c1de4c0db18958029bbf1b0 100644 (file)
--- a/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/charset/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,10 @@ 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.5
+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.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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 +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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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 +169,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/collate/.classpath b/icu4j/main/tests/collate/.classpath
index 4d5cd8ac01d8f8082a1c1ac82e60faf82d087d89..0c00880fbf8d84b4c1800f64552d7251ff2c13a9 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 bdb0cb17d21f8b72a94c67ba79232da29d42cbec..7904873b810b93a3cfd27cf806f39eb7bb12b7a7 100644 (file)
--- a/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/collate/.settings/org.eclipse.jdt.core.prefs
@@ -6,9 +6,10 @@ 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.5
+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.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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 +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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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 +169,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/core/.classpath b/icu4j/main/tests/core/.classpath
index bccc2225a9044022f0be391709682cfe8efa7f1b..86613ce214d1ad54a00df9976848b9b18e18864d 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 4725b5d257b9fb686222c344f304e89b5a9948bd..2369afdba98a85cbe31c1be2a8321ae522db73c8 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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/framework/.classpath b/icu4j/main/tests/framework/.classpath
index e3b5e98518075425a7e1f4f3c7a8244982584471..dc19734b492c35c781e78157cb6bffafd6cab53f 100644 (file)
--- a/icu4j/main/tests/framework/.classpath
+++ b/icu4j/main/tests/framework/.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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

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 1f232e8213f987b4039f916a2e5b5dfc2920d4d2..76b45e06cf98abfb9f3fda57d5c90d3cc61c8f48 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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/localespi/build.properties b/icu4j/main/tests/localespi/build.properties
index 37e2b8eca03ff3ebb73fc33a420bbdc81a0f4931..3e0dbb0d7a9ee0a396305dd3d98fe9501aab6c28 100644 (file)
--- a/icu4j/main/tests/localespi/build.properties
+++ b/icu4j/main/tests/localespi/build.properties
@@ -1,8 +1,5 @@
 #*******************************************************************************
-#* Copyright (C) 2009, International Business Machines Corporation and         *
+#* Copyright (C) 2009-2015, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 shared.dir = ../../shared
-
-javac.source = 1.6
-javac.target = 1.6

diff --git a/icu4j/main/tests/packaging/.classpath b/icu4j/main/tests/packaging/.classpath
index 51faee8d6206db8046fa0cba27e8ce347feb8ef1..f02efe6bfe4405b7eba3596a6cdb2a31ed95e3e6 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
        <classpathentry kind="output" path="out/bin"/>

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 4725b5d257b9fb686222c344f304e89b5a9948bd..2369afdba98a85cbe31c1be2a8321ae522db73c8 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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/testall/.classpath b/icu4j/main/tests/testall/.classpath
index a785117cadb3800622185e11884826b171b4a6ae..077156d735884281b292dac55d5b5ea41b55c1a0 100644 (file)
--- a/icu4j/main/tests/testall/.classpath
+++ b/icu4j/main/tests/testall/.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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-charset"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-charset-tests"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>

diff --git a/icu4j/main/tests/testall/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/testall/.settings/org.eclipse.jdt.core.prefs
index 09065734d0b36c6966e8ce15ce3e4bb617fd4cf0..1ef6be21668b7a8294e5748bc616822d622d9676 100644 (file)
--- a/icu4j/main/tests/testall/.settings/org.eclipse.jdt.core.prefs
+++ b/icu4j/main/tests/testall/.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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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_annotation=0

diff --git a/icu4j/main/tests/translit/.classpath b/icu4j/main/tests/translit/.classpath
index 744ac953177dec19eee573b1bb3e301628436abd..4794e159e1e858d7bd212b984c8d94fa3ae2a463 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>
        <classpathentry kind="output" path="out/bin"/>
 </classpath>

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 bdb0cb17d21f8b72a94c67ba79232da29d42cbec..d57efd451532a3b85ac42bbe6378166a67c105bd 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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/samples/.classpath b/icu4j/samples/.classpath
index 7eb130ff00bd0f2b51dbacc01f08310690959b0e..77ceac241fd6e20a041aed8a2f0032e05620df5a 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/J2SE-1.5"/>
+       <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.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 bd6b48eee14db9499f40c9e680189c872d3f0a90..f5db98f8005ed32e27c7f41c45916a05e40c14cd 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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
@@ -181,9 +181,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/tools/misc/.classpath b/icu4j/tools/misc/.classpath
index 4468231cb9bb725187a0d6fe5972f52714ec6956..adc2566dc1558b3982503b642eacedfa214de05d 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/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <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 80422e5e9adccee88a33d5798892aa149ab2035b..8e21554758685cb3f7b20ffb0bf5799bd48faa8d 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 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.5
+org.eclipse.jdt.core.compiler.source=1.6
 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