From f316372f276c05183db7d344368969cedbc07df2 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Thu, 19 Dec 2013 16:28:20 -0500 Subject: [PATCH] tmf: Update swtbot tests to use Java 7 Change-Id: Iee44b29888663b49211600a8fd1e770ce5e8d8a3 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/20091 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle IP-Clean: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- org.eclipse.linuxtools.tmf.ui.swtbot.tests/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.classpath b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.classpath index ad32c83a78..098194ca4b 100644 --- a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.classpath +++ b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.settings/org.eclipse.jdt.core.prefs index ccd0247adc..4e9ec4255f 100644 --- a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/.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=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -110,7 +110,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF index 765d133b85..5e2e143b55 100644 --- a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.linuxtools.tmf.ui.swtbot.tests;singleton:=true Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Export-Package: org.eclipse.linuxtools.tmf.ui.swtbot.tests, org.eclipse.linuxtools.tmf.ui.swtbot.tests.conditions Require-Bundle: org.apache.log4j, -- 2.34.1