From 4bbdb1390229642767aba05538f73ab5bb856ea4 Mon Sep 17 00:00:00 2001
From: Colin Ritchie
Date: Tue, 29 Mar 2016 12:54:12 -0700
Subject: 487770: Mylyn bundles require Java 8

Change-Id: I17c362d99d2f87cfd50a3233ee8c32d8e4fe4320
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=487770
Signed-off-by: Colin Ritchie <colin.ritchie@tasktop.com>---
 org.eclipse.mylyn.tasks.core/.classpath                             | 2 +-
 org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs   | 6 +++---
 org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF                   | 2 +-
 .../src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java    | 5 ++---
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'org.eclipse.mylyn.tasks.core')

diff --git a/org.eclipse.mylyn.tasks.core/.classpath b/org.eclipse.mylyn.tasks.core/.classpath
index 691495511..ab940dee2 100644
--- a/org.eclipse.mylyn.tasks.core/.classpath
+++ b/org.eclipse.mylyn.tasks.core/.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/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<accessrules>
 			<accessrule kind="nonaccessible" pattern="com/sun/**"/>
 		</accessrules>
diff --git a/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
index 13c46498b..54ee8bd58 100644
--- a/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.mylyn.tasks.core/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,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.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -76,7 +76,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 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.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
diff --git a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
index 3b0cd6417..3aa2fbf69 100644
--- a/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.mylyn.tasks.core;singleton:=true
 Bundle-Version: 3.20.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.net,
  org.eclipse.equinox.security,
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java
index 665c84136..6e164a1e2 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskInitializationData.java
@@ -28,7 +28,7 @@ import org.eclipse.mylyn.tasks.core.data.TaskData;
  * data into {@link AbstractTaskDataHandler#initializeTaskData()}. It provides common accessors and mutators for a set
  * of fields used during task data initialization. Only attributes of type {@link String} are supported, other accessors
  * throw {@link UnsupportedOperationException} as documented for each method.
- * 
+ *
  * @author Benjamin Muskalla
  * @since 3.10
  * @noextend This class is not intended to be subclassed by clients.
@@ -111,7 +111,7 @@ public class TaskInitializationData implements ITaskMapping {
 
 	/**
 	 * Returns <code>null</code>.
-	 * 
+	 *
 	 * @since 3.15
 	 */
 	@Nullable
@@ -202,7 +202,6 @@ public class TaskInitializationData implements ITaskMapping {
 	/**
 	 * Throws {@link UnsupportedOperationException}.
 	 */
-	@Nullable
 	public void merge(ITaskMapping source) {
 		throw new UnsupportedOperationException();
 	}
-- 
cgit v1.2.3