diff options
author | Christian W. Damus | 2015-02-10 15:34:02 +0000 |
---|---|---|
committer | Christian W. Damus | 2015-02-11 14:31:33 +0000 |
commit | 0b8eef8e59cb91fb3b0348e3f82a474bf06e4ad4 (patch) | |
tree | d3196c2cd734d2bf4e683a1b3bc3a756c81114a2 /plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui | |
parent | 47a579d759aa402fc63cde46060488164a4b5a44 (diff) | |
download | org.eclipse.papyrus-0b8eef8e59cb91fb3b0348e3f82a474bf06e4ad4.tar.gz org.eclipse.papyrus-0b8eef8e59cb91fb3b0348e3f82a474bf06e4ad4.tar.xz org.eclipse.papyrus-0b8eef8e59cb91fb3b0348e3f82a474bf06e4ad4.zip |
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
Diffstat (limited to 'plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui')
3 files changed, 11 insertions, 8 deletions
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath index 2d1a4302f04..ad32c83a788 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.classpath +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.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/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs index 4d72ad12656..94d61f00da6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/.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/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF index 6ff9a0f9b09..343d9e03cb9 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.jface.ui/META-INF/MANIFEST.MF @@ -13,5 +13,5 @@ Bundle-Activator: org.eclipse.papyrus.emf.facet.util.jface.ui.internal .Activator
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.emf.facet.util.jface.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|