diff options
| author | Lars Vogel | 2014-09-11 09:58:44 +0000 |
|---|---|---|
| committer | Lars Vogel | 2014-09-11 10:19:52 +0000 |
| commit | 6af206598cd23781d12414182934f1741ed42ead (patch) | |
| tree | 5b687d22a3b5953e96615e65060ae75c70520dd0 | |
| parent | 2437b38ffea75a1b07a4c9c92bbd4c1a398a5513 (diff) | |
| download | eclipse.platform.ui-6af206598cd23781d12414182934f1741ed42ead.tar.gz eclipse.platform.ui-6af206598cd23781d12414182934f1741ed42ead.tar.xz eclipse.platform.ui-6af206598cd23781d12414182934f1741ed42ead.zip | |
Bug 443804 - [Tests] Update org.eclipse.ui.tests.harness to Java 1.6
Change-Id: I01f5a9e53a55e18fbc56344b332bf4490e0fe337
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
4 files changed, 10 insertions, 21 deletions
diff --git a/tests/org.eclipse.ui.tests.harness/.classpath b/tests/org.eclipse.ui.tests.harness/.classpath index ce73933404a..deb673668e9 100644 --- a/tests/org.eclipse.ui.tests.harness/.classpath +++ b/tests/org.eclipse.ui.tests.harness/.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.4"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <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="bin"/> </classpath> diff --git a/tests/org.eclipse.ui.tests.harness/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.ui.tests.harness/.settings/org.eclipse.jdt.core.prefs index ec1b3eff13b..ec6503d7b39 100755 --- a/tests/org.eclipse.ui.tests.harness/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.ui.tests.harness/.settings/org.eclipse.jdt.core.prefs @@ -13,16 +13,16 @@ 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.2 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 +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 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=error @@ -31,7 +31,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -118,6 +118,6 @@ 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.3 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF index a1fe81fb6c4..874b9fcfcca 100644 --- a/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.harness/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Harness Plug-in Bundle-SymbolicName: org.eclipse.ui.tests.harness;singleton:=true -Bundle-Version: 1.2.0.qualifier +Bundle-Version: 1.3.0.qualifier Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.ui.tests.harness.UITestHarnessPlugin Require-Bundle: org.eclipse.ui, @@ -14,4 +14,4 @@ Export-Package: org.eclipse.ui.tests.harness, org.eclipse.ui.tests.harness.tests, org.eclipse.ui.tests.harness.util, org.eclipse.ui.tests.internal.util;x-internal:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/tests/org.eclipse.ui.tests.harness/pom.xml b/tests/org.eclipse.ui.tests.harness/pom.xml index 7e334669160..00c37c60514 100644 --- a/tests/org.eclipse.ui.tests.harness/pom.xml +++ b/tests/org.eclipse.ui.tests.harness/pom.xml @@ -18,18 +18,7 @@ </parent> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui.tests.harness</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <!-- observed BREE as of Juno --> - <executionEnvironment>J2SE-1.4</executionEnvironment> - </configuration> - </plugin> - </plugins> - </build> + </project> |
