From 24278bb01118f381c0614dad3bff58c120f1a4ef Mon Sep 17 00:00:00 2001 From: Igor Fedorenko Date: Sat, 16 Feb 2013 10:44:31 -0500 Subject: require at least JavaSE-1.6 execution runtime environment Signed-off-by: Igor Fedorenko --- m2e-maven-runtime/pom.xml | 2 +- org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 3 ++- org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.core/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.discovery/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.launching/META-INF/MANIFEST.MF | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF | 3 ++- org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 3 ++- org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs | 6 +++--- org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF | 4 ++-- 27 files changed, 66 insertions(+), 63 deletions(-) diff --git a/m2e-maven-runtime/pom.xml b/m2e-maven-runtime/pom.xml index 5a0cc445..d1e46e32 100644 --- a/m2e-maven-runtime/pom.xml +++ b/m2e-maven-runtime/pom.xml @@ -72,7 +72,7 @@ <_snapshot>${osgi-version-qualifier} ${project.artifactId};singleton:=false - J2SE-1.5,JavaSE-1.6 + JavaSE-1.6,JavaSE-1.7 %Bundle-Name %Bundle-Vendor {maven-dependencies} diff --git a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core.ui/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index 189103d2..792b9e7a 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true Bundle-Version: 1.4.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF index fcc1a178..5c3b3dcf 100644 --- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF @@ -16,8 +16,8 @@ Require-Bundle: com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)" Eclipse-LazyStart: true Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Export-Package: org.eclipse.m2e.core, org.eclipse.m2e.core.archetype, org.eclipse.m2e.core.embedder, diff --git a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.discovery/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index cc5c1f65..5b794159 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true Bundle-Version: 1.4.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . Bundle-Localization: plugin diff --git a/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor.xml/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF index 603bac3d..78ddcc89 100644 --- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF @@ -28,6 +28,6 @@ Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true, org.eclipse.m2e.editor.xml.preferences;x-internal:=true Bundle-ClassPath: . Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Service-Component: OSGI-INF/component.xml diff --git a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 895a54f3..6e7b0dbd 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -25,8 +25,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.common, org.eclipse.emf.ecore Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: . Export-Package: org.eclipse.m2e.editor;x-internal:=true, diff --git a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.jdt/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index aa62d4b2..72a8b81c 100644 --- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.m2e.core.ui;bundle-version="[1.4.0,1.5.0)" Eclipse-LazyStart: true Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.launching/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index c77a7caf..aaa3f8b9 100644 --- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF @@ -24,8 +24,8 @@ Require-Bundle: org.eclipse.core.runtime, org.slf4j.api;bundle-version="1.6.2", org.eclipse.jdt.debug Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.m2e.actions;x-internal:=true, org.eclipse.m2e.internal.launch;x-internal:=true, diff --git a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.logback.appender/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF index 8f76d5f2..df23cc37 100644 --- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-SymbolicName: org.eclipse.m2e.logback.appender;singleton:=true Bundle-Version: 1.4.0.qualifier Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Fragment-Host: ch.qos.logback.classic Export-Package: org.eclipse.m2e.logback.appender;x-internal:=true Require-Bundle: org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.logback.configuration/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF index 25cd1348..f63c9866 100644 --- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF @@ -10,6 +10,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", ch.qos.logback.core;bundle-version="0.9.24", org.slf4j.api;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Export-Package: org.eclipse.m2e.logback.configuration;x-internal:=true diff --git a/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.model.edit/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF index c839f82c..86cf6374 100644 --- a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: %Bundle-Name -Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Vendor: %Bundle-Vendor Bundle-Version: 1.4.0.qualifier Bundle-ManifestVersion: 2 diff --git a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.refactoring/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index 4b77e43b..caad7e17 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.4.0,1.5.0)", org.eclipse.m2e.core.ui;bundle-version="[1.4.0,1.5.0)", org.slf4j.api;bundle-version="1.6.2" Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal:=true diff --git a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.scm/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index 2277d14a..102f001e 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.scm;singleton:=true Bundle-Version: 1.4.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs index 80d9c54b..e471c2df 100644 --- a/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.tests.common/.settings/org.eclipse.jdt.core.prefs @@ -18,9 +18,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= 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 @@ -105,7 +105,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF index 6a1ed78e..50334ffd 100644 --- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.jdt.core, org.eclipse.debug.core Eclipse-LazyStart: true -Bundle-RequiredExecutionEnvironment: J2SE-1.5, - JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6, + JavaSE-1.7 Bundle-ClassPath: ., jars/servlet-api-2.5-20081211.jar, jars/jetty-util-6.1.22.jar, -- cgit v1.2.3