[Releng] Fix for efx dependency
Change-Id: Icfd12b44bb396171cf341c9bd45dfae7ae577757
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/features/org.eclipse.papyrus.ease.feature/feature.xml b/features/org.eclipse.papyrus.ease.feature/feature.xml
index ad43f55..e5f1820 100644
--- a/features/org.eclipse.papyrus.ease.feature/feature.xml
+++ b/features/org.eclipse.papyrus.ease.feature/feature.xml
@@ -21,6 +21,7 @@
<requires>
<import feature="org.eclipse.ease.modules.modeling.feature" version="0.7.0" match="compatible"/>
+ <import feature="org.eclipse.fx.ide.basic.feature" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.core.filesystem"/>
<import plugin="org.eclipse.core.expressions" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.13.0" match="compatible"/>
diff --git a/releng/org.eclipse.papyrus.ease.p2/pom.xml b/releng/org.eclipse.papyrus.ease.p2/pom.xml
index b61776d..3ec6378 100644
--- a/releng/org.eclipse.papyrus.ease.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.ease.p2/pom.xml
@@ -37,6 +37,8 @@
<site>http://eclipse.py4j.org/</site>
<!-- EASE Udate site -->
<site>https://download.eclipse.org/ease/release/0.7.0</site>
+ <!-- E(fx)clipse Update site -->
+ <site>https://download.eclipse.org/efxclipse/updates-released/3.5.0/site/</site>
</associateSites>
</configuration>
</execution>
diff --git a/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.target b/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.target
index 57cd52e..dcd723e 100644
--- a/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.target
+++ b/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus EASE" sequenceNumber="1567760555">
+<target name="Papyrus EASE" sequenceNumber="1568293257">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -13,7 +13,7 @@
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
- <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/2019-03/"/>
+ <repository id="eclipse" location="http://download.eclipse.org/releases/2019-03/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
@@ -31,5 +31,9 @@
<unit id="org.py4j.feature.feature.group" version="0.0.0"/>
<repository id="py4j" location="http://eclipse.py4j.org/"/>
</location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.fx.ide.basic.feature.feature.group" version="0.0.0"/>
+ <repository id="efxclipse" location="https://download.eclipse.org/efxclipse/updates-released/3.5.0/site/"/>
+ </location>
</locations>
</target>
diff --git a/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd b/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd
index 2b6e953..92cdfe4 100644
--- a/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd
+++ b/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd
@@ -1,6 +1,6 @@
target "Papyrus EASE" with source requirements
-location "http://download.eclipse.org/releases/2019-03/" eclipse-oxygen {
+location "http://download.eclipse.org/releases/2019-03/" eclipse {
org.eclipse.equinox.executable.feature.group lazy
org.eclipse.equinox.p2.discovery.feature.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -27,3 +27,7 @@
location "http://eclipse.py4j.org/" py4j {
org.py4j.feature.feature.group lazy
}
+
+location "https://download.eclipse.org/efxclipse/updates-released/3.5.0/site/" efxclipse {
+ org.eclipse.fx.ide.basic.feature.feature.group lazy
+}