[releng] Remove unnecessary dependency (since we remove non core
plugins)
* Remove unnecessary dependency in target platform
* Remove unnecessary import in feature
org.eclipse.nebula.visualization.xygraph
* Rearrange alphabetically the feature
Change-Id: I50751cb9083d84d6c3ec0ded7523c220ceca6909
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index b236d8f..2abc9be 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -21,31 +21,57 @@
<requires>
<import feature="org.eclipse.papyrus.sdk.feature" version="0.0.0"/>
- <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
- <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
- <import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
- <import plugin="org.eclipse.ui.console" version="3.8.0" match="compatible"/>
<import plugin="org.aspectj.runtime" version="1.9.0" match="compatible"/>
<import plugin="org.apache.commons.lang" version="2.6.0" match="compatible"/>
- <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.12.0" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.13.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
- <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.runtime.emf.type.core" version="1.9.0" match="compatible"/>
- <import plugin="org.eclipse.equinox.registry" version="3.8.0" match="compatible"/>
- <import plugin="org.eclipse.emf.validation" version="1.8.0" match="compatible"/>
- <import plugin="org.aspectj.runtime" version="1.9.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.osgi" version="3.10.0" match="compatible"/>
- <import plugin="org.eclipse.emf.common.ui" version="2.13.0" match="compatible"/>
- <import plugin="org.eclipse.papyrus.infra.properties" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.draw2d" version="3.10.100" match="compatible"/>
- <import plugin="org.eclipse.nebula.visualization.xygraph" version="3.1.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.common.ui" version="2.13.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.13.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.validation" version="1.8.0" match="compatible"/>
+ <import plugin="org.eclipse.equinox.registry" version="3.8.0" match="compatible"/>
+ <import plugin="org.eclipse.gef" version="3.11.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.runtime.emf.type.core" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.jface" version="3.14.0" match="compatible"/>
+ <import plugin="org.eclipse.osgi" version="3.10.0" match="compatible"/>
<import plugin="org.eclipse.swt"/>
+ <import plugin="org.eclipse.ui" version="3.109.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.console" version="3.8.0" match="compatible"/>
+ <import plugin="org.eclipse.uml2.uml" version="5.4.0" match="compatible"/>
</requires>
<plugin
+ id="org.aspectj.runtime"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.aspectj.weaver"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.weaving.aspectj"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.equinox.weaving.hook"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.papyrus.moka"
download-size="0"
install-size="0"
@@ -151,35 +177,6 @@
unpack="false"/>
<plugin
- id="org.aspectj.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.aspectj.weaver"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.weaving.aspectj"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.weaving.hook"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.papyrus.moka.discreteevent"
download-size="0"
install-size="0"
@@ -222,13 +219,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.nebula.visualization.xygraph"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.papyrus.moka.modeling.utils"
download-size="0"
install-size="0"
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
index d4cc46f..92e6b87 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.target
@@ -25,23 +25,5 @@
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="0.0.0"/>
<repository id="aspectj" location="http://download.eclipse.org/tools/ajdt/48/dev/update/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
- <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
- <unit id="com.github.jnr.constants" version="0.0.0"/>
- <unit id="com.github.jnr.enxio" version="0.0.0"/>
- <unit id="com.github.jnr.ffi" version="0.0.0"/>
- <unit id="com.github.jnr.jffi" version="0.0.0"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.nebula.visualization.feature.feature.group" version="0.0.0"/>
- <repository id="nebula" location="http://download.eclipse.org/nebula/releases/2.0.1"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
- <repository id="sysml-photon" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/photon/"/>
- </location>
</locations>
</target>
diff --git a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
index 8ba67f4..c9473b8 100644
--- a/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
+++ b/releng/platforms/org.eclipse.papyrus.moka.targetplatform.photon/org.eclipse.papyrus.moka.targetplatform.photon.tpd
@@ -20,21 +20,3 @@
org.eclipse.ajdt.feature.group lazy
org.eclipse.equinox.weaving.sdk.feature.group lazy
}
-
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" orbit {
- com.fasterxml.jackson.core.jackson-annotations lazy
- com.fasterxml.jackson.core.jackson-core lazy
- com.github.jnr.constants lazy
- com.github.jnr.enxio lazy
- com.github.jnr.ffi lazy
- com.github.jnr.jffi lazy
-}
-
-location "http://download.eclipse.org/nebula/releases/2.0.1" nebula {
- org.eclipse.nebula.widgets.xviewer.feature.feature.group lazy
- org.eclipse.nebula.visualization.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/photon/" sysml-photon {
- org.eclipse.papyrus.sysml14.feature.feature.group lazy
-}
\ No newline at end of file
