[build] Fix Tycho build

Change-Id: Idf224e0c69ac8b3a13bfbf1959d96a77bc2f3b72
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

9 files changed, 94 insertions, 17 deletions

diff --git a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
index 7054287fa..72e025ea2 100644
--- a/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.core/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
 Import-Package: com.google.common.base;version="[15.0.0,16.0.0)",
  com.google.common.collect;version="[15.0.0,16.0.0)",
  org.eclipse.eef;version="[2.0.0,3.0.0)",
- org.eclipse.sirius.common.interpreter.api;version="[1.0.0,2.0.0)"
+ org.eclipse.sirius.common.interpreter.api;version="1.0.0"
 Export-Package: org.eclipse.eef.core.api;version="2.0.0",
  org.eclipse.eef.core.api.controllers;version="2.0.0",
  org.eclipse.eef.core.internal;version="2.0.0";x-internal:=true,
diff --git a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
index dabf150e6..7206527ba 100644
--- a/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Import-Package: org.eclipse.eef;version="[2.0.0,3.0.0)",
  org.eclipse.eef.core.api.controllers;version="2.0.0",
  org.eclipse.eef.ide.internal;version="[2.0.0,3.0.0)",
  org.eclipse.eef.ide.internal.extensions;version="[2.0.0,3.0.0)",
- org.eclipse.sirius.common.interpreter.api;version="[1.0.0,2.0.0)"
+ org.eclipse.sirius.common.interpreter.api;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.8.0,3.0.0)",
diff --git a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
index b3f86cfa2..3271736a5 100644
--- a/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.eef.ide/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Import-Package: org.eclipse.eef;version="[2.0.0,3.0.0)",
  org.eclipse.eef.api;version="[2.0.0,3.0.0)",
- org.eclipse.sirius.common.interpreter.api;version="[1.0.0,2.0.0)"
+ org.eclipse.sirius.common.interpreter.api;version="1.0.0"
 Export-Package: org.eclipse.eef.ide.internal;version="2.0.0";x-friends:="org.eclipse.eef.ide.ui",
  org.eclipse.eef.ide.internal.extensions;version="2.0.0";x-friends:="org.eclipse.eef.ide.ui",
  org.eclipse.eef.ide.internal.extensions.impl;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.eef.properties.ui/.project b/plugins/org.eclipse.eef.properties.ui/.project
new file mode 100644
index 000000000..5314c9796
--- /dev/null
+++ b/plugins/org.eclipse.eef.properties.ui/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.eef.properties.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml
index e9c1f003b..ef5922e7a 100644
--- a/releng/org.eclipse.eef.releng/pom.xml
+++ b/releng/org.eclipse.eef.releng/pom.xml
@@ -20,7 +20,7 @@ Contributors:
   <name>EEF Parent</name>
 
   <properties>
-    <tycho-version>0.20.0</tycho-version>
+    <tycho-version>0.24.0</tycho-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
index a57b552d2..a83308ef7 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
+++ b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.target
@@ -1,20 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Neon" sequenceNumber="1445593356">
+<target name="Eclipse Neon" sequenceNumber="1449572326">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+      <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
+      <repository id="Acceleo-3.6" location="http://download.eclipse.org/acceleo/updates/releases/3.6/R201510121214/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.aql.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.uml2.uml.editor" version="0.0.0"/>
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/neon"/>
+      <repository id="Eclipse-Neon" location="http://download.eclipse.org/releases/neon"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.aql.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.tests.support.feature.group" version="0.0.0"/>
+      <repository id="Sirius-Core" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sirius.incubation.feature.group" version="0.0.0"/>
+      <repository id="Sirius-Incubation" location="http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
index 7310a035f..f7ec76b23 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
+++ b/releng/org.eclipse.eef.releng/targetplatforms/neon/neon.tpd
@@ -1,16 +1,36 @@
 target "Eclipse Neon"
 
+include "http://download.eclipse.org/sirius/updates/nightly/targets/modules/aql-3.6.tpd"
+
 with source requirements
 
-location "http://download.eclipse.org/releases/neon" {
+location Eclipse-Neon "http://download.eclipse.org/releases/neon" {
 	org.eclipse.platform.feature.group lazy
 	org.eclipse.sdk.feature.group lazy
-	org.eclipse.acceleo.query.feature.group lazy
-	org.eclipse.sirius.aql.feature.group lazy
-	org.eclipse.sirius.specifier.feature.group lazy
 	org.eclipse.uml2.uml.feature.group lazy
 	org.eclipse.uml2.uml.editor lazy
 	org.eclipse.xtext.sdk.feature.group lazy
 	org.eclipse.xtend.sdk.feature.group lazy
 	org.eclipse.emf.mwe2.runtime.sdk.feature.group lazy
-}
\ No newline at end of file
+}
+
+location Sirius-Core "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
+	org.eclipse.sirius.doc.feature.feature.group lazy
+	org.eclipse.sirius.runtime.acceleo.feature.group lazy
+	org.eclipse.sirius.runtime.feature.group lazy
+	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
+	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+	org.eclipse.sirius.runtime.ide.xtext.feature.group lazy
+	org.eclipse.sirius.runtime.ocl.feature.group lazy
+	org.eclipse.sirius.runtime.aql.feature.group lazy
+	org.eclipse.sirius.samples.feature.group lazy
+	org.eclipse.sirius.specifier.ide.ui.acceleo.feature.group lazy
+	org.eclipse.sirius.specifier.ide.ui.aql.feature.group lazy
+	org.eclipse.sirius.specifier.ide.ui.feature.group lazy
+	org.eclipse.sirius.tests.support.feature.group lazy
+}
+
+location Sirius-Incubation "http://download.eclipse.org/sirius/updates/nightly/latest/neon/incubation" {
+	org.eclipse.sirius.incubation.feature.group lazy
+}
diff --git a/tests/org.eclipse.eef.tests/.classpath b/tests/org.eclipse.eef.tests/.classpath
index ad32c83a7..4f83b2397 100644
--- a/tests/org.eclipse.eef.tests/.classpath
+++ b/tests/org.eclipse.eef.tests/.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/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<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.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
index c28bd8ed0..c1650ecca 100644
--- a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.tests
 Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Export-Package: org.eclipse.eef.tests.internal;version="2.0.0";x-internal:=true,
  org.eclipse.eef.tests.internal.controllers;version="2.0.0";x-internal:=true
@@ -12,4 +12,4 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.eef;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.eef.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.sirius.common.interpreter;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.sirius.common.interpreter;bundle-version="1.0.0"