diff options
author | Sopot Cela | 2014-02-17 15:40:26 +0000 |
---|---|---|
committer | Lars Vogel | 2014-02-21 16:50:06 +0000 |
commit | ef5534c280dce93b2e0f70a05c5a682a51ac3f4b (patch) | |
tree | 75ccd56fcd734dc6ed5c46871f9cd9d4bcc50fc4 | |
parent | 6c47e5bf7b9b81adb02fb00919b0bf72e49f5e92 (diff) | |
download | org.eclipse.e4.tools-ef5534c280dce93b2e0f70a05c5a682a51ac3f4b.tar.gz org.eclipse.e4.tools-ef5534c280dce93b2e0f70a05c5a682a51ac3f4b.tar.xz org.eclipse.e4.tools-ef5534c280dce93b2e0f70a05c5a682a51ac3f4b.zip |
Bug 428360 - Switch e4 tools to Java 1.6I20140227-2200I20140227-1440I20140226-2200I20140225-2200I20140224-2200I20140223-2200I20140222-2200I20140221-2200
Change-Id: I19d1e14ae242897b0a4d53fb2373e4cb8df731e6
Signed-off-by: Sopot Cela <sopotcela@gmail.com>
30 files changed, 73 insertions, 65 deletions
diff --git a/bundles/org.eclipse.e4.tools.compat/.classpath b/bundles/org.eclipse.e4.tools.compat/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.compat/.classpath +++ b/bundles/org.eclipse.e4.tools.compat/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs index 4fe42718..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.compat/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Mon May 31 09:52:05 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF index 6cedfefc..4cfc6248 100644 --- a/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.compat/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.tools.compat;singleton:=true Bundle-Version: 0.12.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.e4.core.contexts;bundle-version="0.9.0", diff --git a/bundles/org.eclipse.e4.tools.css.editor.ui/.classpath b/bundles/org.eclipse.e4.tools.css.editor.ui/.classpath index e5fbd3dd..5d0495ec 100644 --- a/bundles/org.eclipse.e4.tools.css.editor.ui/.classpath +++ b/bundles/org.eclipse.e4.tools.css.editor.ui/.classpath @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <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.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src-gen"/> + <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/bundles/org.eclipse.e4.tools.css.editor.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.css.editor.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..c537b630 --- /dev/null +++ b/bundles/org.eclipse.e4.tools.css.editor.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +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.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.css.editor.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.css.editor.ui/META-INF/MANIFEST.MF index 1042c6d6..9a2e0a2b 100644 --- a/bundles/org.eclipse.e4.tools.css.editor.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.css.editor.ui/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.e4.tools.css.editor;visibility:=reexport, org.eclipse.core.filesystem;bundle-version="1.3.200" Import-Package: org.apache.log4j, org.apache.commons.logging -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.e4.ui.contentassist.antlr, org.eclipse.e4.ui.internal Bundle-Activator: org.eclipse.e4.ui.internal.CSSActivator diff --git a/bundles/org.eclipse.e4.tools.css.editor/.classpath b/bundles/org.eclipse.e4.tools.css.editor/.classpath index 3f1be502..6ea81b1e 100644 --- a/bundles/org.eclipse.e4.tools.css.editor/.classpath +++ b/bundles/org.eclipse.e4.tools.css.editor/.classpath @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <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.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src-gen"/> + <classpathentry kind="src" path="xtend-gen"/> + <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/bundles/org.eclipse.e4.tools.css.editor/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.css.editor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..c537b630 --- /dev/null +++ b/bundles/org.eclipse.e4.tools.css.editor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +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.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.css.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.css.editor/META-INF/MANIFEST.MF index a9d2fb42..2d406640 100644 --- a/bundles/org.eclipse.e4.tools.css.editor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.css.editor/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport, Import-Package: org.apache.commons.logging, org.apache.log4j, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.e4, org.eclipse.e4.services, org.eclipse.e4.cSS, diff --git a/bundles/org.eclipse.e4.tools.css.spy/.classpath b/bundles/org.eclipse.e4.tools.css.spy/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.css.spy/.classpath +++ b/bundles/org.eclipse.e4.tools.css.spy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.css.spy/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.css.spy/.settings/org.eclipse.jdt.core.prefs index af0f20f9..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.css.spy/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.css.spy/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF index 5255ec6b..b029b8b8 100644 --- a/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.css.spy/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1", org.eclipse.e4.ui.widgets;bundle-version="0.11.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: javax.inject, org.eclipse.e4.core.contexts, diff --git a/bundles/org.eclipse.e4.tools.emf.editor/.classpath b/bundles/org.eclipse.e4.tools.emf.editor/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor/.classpath +++ b/bundles/org.eclipse.e4.tools.emf.editor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.emf.editor/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor/.settings/org.eclipse.jdt.core.prefs index da2d41a3..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.emf.editor/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Sun Mar 07 16:24:33 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF index 53000bbe..ba9c7c63 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.emf.editor/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jface;bundle-version="3.7.0", org.eclipse.emf.ecore.xmi;bundle-version="2.9.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.inject;version="1.0.0", org.eclipse.e4.core.contexts, org.eclipse.e4.core.di.annotations diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs index df1b497b..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Sun Mar 14 13:37:58 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF index c4ae4d5f..56445da6 100644 --- a/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.emf.editor3x/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.tools.emf.editor3x;singleton:=true Bundle-Version: 0.12.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.emf.common;bundle-version="2.6.0", diff --git a/bundles/org.eclipse.e4.tools.emf.liveeditor/.classpath b/bundles/org.eclipse.e4.tools.emf.liveeditor/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.emf.liveeditor/.classpath +++ b/bundles/org.eclipse.e4.tools.emf.liveeditor/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.emf.liveeditor/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.emf.liveeditor/.settings/org.eclipse.jdt.core.prefs index 5bf6d1cf..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.emf.liveeditor/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.emf.liveeditor/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Sun Mar 14 18:18:29 CET 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF index dcf2bd6e..f1f8a149 100644 --- a/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.emf.liveeditor/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.tools.emf.liveeditor;singleton:=true Bundle-Version: 0.12.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.e4.ui.services;bundle-version="0.9.1", org.eclipse.swt;bundle-version="3.6.0", org.eclipse.e4.tools.emf.ui;bundle-version="0.9.0", diff --git a/bundles/org.eclipse.e4.tools.event.spy/.classpath b/bundles/org.eclipse.e4.tools.event.spy/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.event.spy/.classpath +++ b/bundles/org.eclipse.e4.tools.event.spy/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.event.spy/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.event.spy/.settings/org.eclipse.jdt.core.prefs index af0f20f9..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.event.spy/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.event.spy/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF index f8a911cc..1e68fae3 100644 --- a/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.event.spy/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.databinding.observable, org.eclipse.core.databinding.beans, org.eclipse.core.databinding.property -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: javax.annotation;version="1.1.0" Export-Package: org.eclipse.e4.tools.event.spy, diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools.jdt.templates/.classpath +++ b/bundles/org.eclipse.e4.tools.jdt.templates/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs index 5a797383..c537b630 100644 --- a/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools.jdt.templates/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Sat Mar 06 23:33:15 EST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF index 4da685d6..cfd28066 100644 --- a/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools.jdt.templates/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: e4 Templates Bundle-SymbolicName: org.eclipse.e4.tools.jdt.templates;singleton:=true Bundle-Version: 0.12.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.jdt.ui;bundle-version="3.6.0", org.eclipse.ui.editors;bundle-version="3.6.0", org.eclipse.jface.text;bundle-version="3.6.0", diff --git a/bundles/org.eclipse.e4.tools/.classpath b/bundles/org.eclipse.e4.tools/.classpath index 64c5e31b..ad32c83a 100644 --- a/bundles/org.eclipse.e4.tools/.classpath +++ b/bundles/org.eclipse.e4.tools/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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="src" path="src"/> <classpathentry kind="output" path="bin"/> diff --git a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs index 25961444..c537b630 100644 --- a/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.e4.tools/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,7 @@ -#Mon Jul 05 10:09:17 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF index 3e253a80..8ea9d1c8 100644 --- a/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.tools/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.e4.tools;singleton:=true Bundle-Version: 0.12.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1", |