Move to EASE 0.7.0 release
* update from nightly to release
* replace include in feature to import
Change-Id: Ia55d970e0094c9911e74108297fd5def1bbeccd2
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 0cf8c34..ad43f55 100644
--- a/features/org.eclipse.papyrus.ease.feature/feature.xml
+++ b/features/org.eclipse.papyrus.ease.feature/feature.xml
@@ -19,36 +19,9 @@
%license
</license>
- <includes
- id="org.eclipse.ease.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.lang.python.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.lang.python.py4j.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.modules.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.modules.modeling.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.ease.lang.jvm.feature"
- version="0.0.0"/>
-
<requires>
- <import plugin="org.eclipse.core.filesystem"/>
+ <import feature="org.eclipse.ease.modules.modeling.feature" version="0.7.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"/>
<import plugin="org.eclipse.debug.ui" version="3.12.50" match="compatible"/>
diff --git a/releng/org.eclipse.papyrus.ease.configuration/pom.xml b/releng/org.eclipse.papyrus.ease.configuration/pom.xml
index f695767..9f59e19 100644
--- a/releng/org.eclipse.papyrus.ease.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.ease.configuration/pom.xml
@@ -170,26 +170,6 @@
</extraClasspathElements>
</configuration>
</plugin>
- <plugin><!-- disable source bundle generation -->
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <executions>
- <execution>
- <id>plugin-source</id>
- <phase />
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase />
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/releng/org.eclipse.papyrus.ease.p2/pom.xml b/releng/org.eclipse.papyrus.ease.p2/pom.xml
index 7f93677..b61776d 100644
--- a/releng/org.eclipse.papyrus.ease.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.ease.p2/pom.xml
@@ -35,7 +35,8 @@
<associateSites>
<!-- Py4j Update site -->
<site>http://eclipse.py4j.org/</site>
- <!--site>http://download.eclipse.org/ease/update/nightly</site-->
+ <!-- EASE Udate site -->
+ <site>https://download.eclipse.org/ease/release/0.7.0</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 701e0b0..57cd52e 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/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus EASE" sequenceNumber="1563377949">
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus EASE" sequenceNumber="1567760555">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
@@ -25,7 +25,7 @@
<unit id="org.eclipse.ease.modules.modeling.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ease.ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ease.lang.jvm.feature.feature.group" version="0.0.0"/>
- <repository id="ease" location="http://download.eclipse.org/ease/update/nightly"/>
+ <repository id="ease" location="https://download.eclipse.org/ease/release/0.7.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.py4j.feature.feature.group" version="0.0.0"/>
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 b319b0c..2b6e953 100644
--- a/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd
+++ b/releng/platforms/org.eclipse.papyrus.ease.targetplatform.2019-03.tpd
@@ -12,7 +12,7 @@
org.eclipse.xtend.sdk.feature.group lazy
}
-location "http://download.eclipse.org/ease/update/nightly" ease {
+location "https://download.eclipse.org/ease/release/0.7.0/" ease {
org.eclipse.ease.feature.feature.group lazy
org.eclipse.ease.lang.javascript.feature.feature.group lazy
org.eclipse.ease.lang.python.feature.feature.group lazy
