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

19 files changed, 66 insertions, 57 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
index 1e2f32ba854..58bd499c050 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/pom.xml
@@ -48,15 +48,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Tycho build using the project's JDT settings. -->
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-compiler-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <configuration>
-                    <useProjectSettings>true</useProjectSettings>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath
index cedf0d0d0b5..c1f31893de4 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<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-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.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/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
index 979e1be0128..ab1193ee888 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.documentation.plugin.edit;sin

  gleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath
index cedf0d0d0b5..c1f31893de4 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<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-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.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/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
index 79fdb5d9d9a..337c3dd83ef 100644
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
@@ -19,5 +19,5 @@ Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.documentation.plugin.editor;s

  ingleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath
index 2d1a4302f04..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.classpath
@@ -1,7 +1,7 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<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="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/.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/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
index 6b3cbf31d07..52a6718f107 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.editpartview/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Bundle-Activator: org.eclipse.papyrus.gmf.editpartview.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.gmf.editpartview;singleton:=t

  rue

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath
index 2d1a4302f04..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.classpath
@@ -1,7 +1,7 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<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="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/.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/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
index 6ea14bbfc87..08ac08dee99 100644
--- a/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmf.figureview/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Bundle-Activator: org.eclipse.papyrus.gmf.figureview.Activator
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.gmf.figureview;singleton:=tru

  e

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.classpath b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.classpath
index 45f024e850e..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.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.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="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/.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/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
index 669489a7f60..47f05d16ccd 100644
--- a/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.gmfgenextension/META-INF/MANIFEST.MF
@@ -20,5 +20,5 @@ Bundle-Localization: plugin
 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.gmfgenextension;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.classpath b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.classpath
index 2d1a4302f04..ad32c83a788 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.classpath
@@ -1,7 +1,7 @@
-<?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/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<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="output" path="bin"/>
+</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..94d61f00da6 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/.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/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index de7400682f6..2187bfc64db 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -28,5 +28,5 @@ Bundle-Description: The goal of this plugin is to bring a template and
  ocument model, and  a very simple of document generator.

 Bundle-SymbolicName: org.eclipse.papyrus.uml.developer.mde;singleton:=

  true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6