From defa49e7b53e54bdc8d309f512074024dd3eec0c Mon Sep 17 00:00:00 2001
From: Vincent Lorenzo
Date: Mon, 2 May 2016 23:31:27 +0200
Subject: bug 469382: [Rich Text] Nebula rich text editor integration --- add
 richtext plugins to features --fix build adding nebula and nattable richtext
 to good features

Change-Id: I722ae252c70396de16fb605ac2c9bd630c0e30f5
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
---
 .../feature.xml                                      |   4 ----
 .../org.eclipse.papyrus.infra.ui.feature/feature.xml |   4 +---
 .../feature.xml                                      |   4 +++-
 .../feature.xml                                      |   2 ++
 .../release.digest                                   | Bin 27551 -> 6614 bytes
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
index d07749f485e..6bf9d614719 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
@@ -43,8 +43,4 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.extension.glazedlists" install-size="0" unpack="false" version="0.0.0"/>
    
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.extension.nebula" install-size="0" unpack="false" version="0.0.0"/> 
-   
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.richtext" install-size="0" unpack="false" version="0.0.0"/> 
-
 </feature>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
index 48f97c81ed8..8c6188f6d2f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
@@ -35,8 +35,6 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/>
-    
-   <plugin download-size="0" id="org.eclipse.nebula.widgets.richtext" install-size="0" unpack="false" version="0.0.0"/> 
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.editor.welcome.nattable" install-size="0" unpack="false" version="0.0.0"/> 
 
 </feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
index be36970a5b6..03355e2cb39 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.widget.feature/feature.xml
@@ -16,5 +16,7 @@ http://www.eclipse.org/legal/epl-v10.html
    <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.widgets.toolbox" install-size="0" unpack="false" version="0.0.0"/>
+   
+   <plugin download-size="0" id="org.eclipse.nebula.widgets.richtext" install-size="0" unpack="false" version="0.0.0"/>
 
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
index df552ef02c1..7b0c906c534 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.nattable.feature/feature.xml
@@ -81,4 +81,6 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.extension.nebula" install-size="0" unpack="false" version="0.0.0"/> 
+
 </feature>
diff --git a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest
index d2b73a5fe29..876cfebc050 100644
Binary files a/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest and b/plugins/developer/org.eclipse.papyrus.releng.main.release/release.digest differ
-- 
cgit v1.2.3