[releng] [oxygen] [rcp] Update RCP dependencies

- removed wikitext from the target definition, wikitext is now out of the default features (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=511120)
- removed wikitext from the feature imports
- amenended the target definition to add the missing dependencies following the main and extra target refactor

Change-Id: I408bee9e63e8495e30f4be2bb68c9a0b3217fb46
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

4 files changed, 3 insertions, 1 deletions

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 21ff753cfe4..74a9af42e11 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -46,7 +46,6 @@ http://www.eclipse.org/legal/epl-v10.html
       <import feature="org.eclipse.mylyn.bugzilla_feature"/>
       <import feature="org.eclipse.mylyn.context_feature"/>
       <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
       <import feature="org.eclipse.emf.sdk"/>
       <import feature="org.eclipse.gef.sdk"/>
       <import feature="org.eclipse.uml2.sdk"/>
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index ae7a2d93255..4b904263eeb 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -123,6 +123,7 @@
       <repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20170328-0000"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201703140832"/>
       <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.0.201703140832"/>
       <repository id="emfCompare" location="file:/home/data/httpd/download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201703140832"/>
     </location>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 7d3aec38950..63b3e117eda 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -123,6 +123,7 @@
       <repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20170328-0000"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.0.201703140832"/>

       <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.0.201703140832"/>

       <repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201703140832"/>

     </location>

diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
index 367030716a2..61dcf495cd1 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.tpd
@@ -30,6 +30,7 @@ location mylyn "http://download.eclipse.org/mylyn/drops/3.22.0/v20170328-0000" {
 //updateFrom("EMF COMPARE",0) 
 
 location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S201703140832" {
+	org.eclipse.emf.compare.source.feature.group
 	org.eclipse.emf.compare.ide.ui.source.feature.group
 }