From 0b8eef8e59cb91fb3b0348e3f82a474bf06e4ad4 Mon Sep 17 00:00:00 2001
From: Christian W. Damus
Date: Tue, 10 Feb 2015 10:34:02 -0500
Subject: Bug 459566: [Releng] Consider letting Tycho use JDT's project
 settings for compilation https://bugs.eclipse.org/bugs/show_bug.cgi?id=459566

Add Tycho compiler's <useProjectSettings> to the plug-in management in the main top
POM to ensure that each project's build preferences are respected.

This does require removing a few {@link}/@see references to restricted API in doc
comments to work around a bug in Tycho (459554).

A great many plug-in projects using 1.6 source constructs (mostly @Override of
abstract methods) failed to declare 1.6 requirement either in the BREE, or the
classpath/compiler settings, or both.

Change-Id: Ia73b592fff8d46eaf0bc628b6e21d1e758ff0c64
---
 .../.classpath                                           | 16 ++++++++--------
 .../.settings/org.eclipse.jdt.core.prefs                 |  3 +++
 .../META-INF/MANIFEST.MF                                 |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf')

diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
index e5fbd3dd27a..0c22b5d7e6d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.classpath
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.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="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="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 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
 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/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index 96d097c9533..dde60035487 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -37,5 +37,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.emf.Activato
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singl
  eton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 
-- 
cgit v1.2.3