From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 10 Sep 2019 06:48:52 +0000 (+0200)
Subject: Improve RCP platform.
X-Git-Tag: argeo-commons-2.1.79~4
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=83969f874e4ec0f1123494624160f01016e90ed7

Improve RCP platform.
---

diff --git a/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml b/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
index 7876f2e96..c8f52416b 100644
--- a/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
+++ b/rcp/dep/org.argeo.dep.cms.e4.rcp/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.rcp</groupId>
@@ -30,7 +32,7 @@
 			<artifactId>org.argeo.cms.ui.theme</artifactId>
 			<version>2.1.79-SNAPSHOT</version>
 		</dependency>
-		
+
 		<!-- Desktop -->
 		<dependency>
 			<groupId>org.argeo.commons.rcp</groupId>
@@ -76,372 +78,310 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- SWT for ARM -->
-		<dependency>
-			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.gtk.linux.arm</artifactId>
-			<version>3.108.0.v20180905-1254</version>
-		</dependency>
-
-		<!-- Eclipse launcher -->
-		<dependency>
-			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher</artifactId>
-			<version>1.5.100.v20180827-1352</version>
-		</dependency>
-
-		<!-- RCP -->
+		<!-- SWT and JFace -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.css.swt.theme</artifactId>
-			<version>0.12.100.v20180828-0227</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
-			<version>0.14.300.v20180906-1121</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.contenttype</artifactId>
-			<version>3.7.100.v20180817-1401</version>
+			<artifactId>org.eclipse.swt</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.batik.constants</artifactId>
-			<version>1.10.0.v20180703-1553</version>
+			<artifactId>org.eclipse.jface</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di</artifactId>
-			<version>1.7.100.v20180817-1215</version>
+			<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-			<version>3.108.0.v20180904-1901</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.runtime</artifactId>
-			<version>3.15.0.v20180817-1401</version>
+			<artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.databinding</artifactId>
-			<version>1.7.0.v20180827-2028</version>
+			<artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.bindings</artifactId>
-			<version>0.12.200.v20180828-0227</version>
+			<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId> -->
+		<!-- </dependency> -->
+
+		<!-- SWT for ARM -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.model.workbench</artifactId>
-			<version>2.1.100.v20180904-1914</version>
+			<artifactId>org.eclipse.swt.gtk.linux.arm</artifactId>
+			<version>3.108.0.v20180905-1254</version>
 		</dependency>
+
+		<!-- Eclipse launcher -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.ui.cocoa</artifactId>
-			<version>1.2.100.v20180828-0838</version>
+			<artifactId>org.eclipse.equinox.launcher</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.felix.scr</artifactId>
-			<version>2.0.14.v20180822-1822</version>
+			<artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.w3c.dom.svg</artifactId>
-			<version>1.1.0.v201011041433</version>
+			<artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.jface.databinding</artifactId>
-			<version>1.8.300.v20180828-0836</version>
+			<artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId>
-			<version>1.3.200.v20180828-0227</version>
+			<artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.services</artifactId>
-			<version>2.1.200.v20180817-1215</version>
+			<artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
 		</dependency>
+
+		<!-- RCP -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.felix.gogo.shell</artifactId>
-			<version>1.1.0.v20180713-1646</version>
+			<artifactId>org.eclipse.e4.ui.css.swt.theme</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.widgets</artifactId>
-			<version>1.2.200.v20180828-0227</version>
+			<artifactId>org.eclipse.e4.ui.workbench.swt</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.commands</artifactId>
-			<version>0.12.300.v20180828-0227</version>
+			<artifactId>org.eclipse.core.contenttype</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId>
-			<version>0.15.200.v20180817-1215</version>
+			<artifactId>org.eclipse.e4.core.di</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.expressions</artifactId>
-			<version>3.6.200.v20180817-1401</version>
+			<artifactId>org.eclipse.core.runtime</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
-			<version>1.1.800.v20180827-1352</version>
+			<artifactId>org.eclipse.core.databinding</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>com.ibm.icu</artifactId>
-			<version>62.1.0.v20180727-1652</version>
+			<artifactId>org.eclipse.e4.ui.bindings</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.batik.css</artifactId>
-			<version>1.10.0.v20180703-1553</version>
+			<artifactId>org.eclipse.e4.ui.model.workbench</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.css.swt</artifactId>
-			<version>0.13.200.v20180828-0227</version>
+			<artifactId>org.eclipse.jface.databinding</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.swt.gtk</artifactId>
-			<version>1.0.400.v20180828-0227</version>
+			<artifactId>org.eclipse.e4.ui.workbench.addons.swt</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.batik.i18n</artifactId>
-			<version>1.10.0.v20180703-1553</version>
+			<artifactId>org.eclipse.e4.core.services</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.w3c.css.sac</artifactId>
-			<version>1.3.1.v200903091627</version>
+			<artifactId>org.apache.felix.gogo.shell</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
-			<version>1.1.800.v20180827-1352</version>
+			<artifactId>org.eclipse.e4.ui.widgets</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.jface</artifactId>
-			<version>3.14.100.v20180828-0836</version>
+			<artifactId>org.eclipse.e4.core.commands</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.emf.xpath</artifactId>
-			<version>0.2.200.v20180828-0227</version>
+			<artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.cocoa.macosx.x86_64</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.eclipse.core.expressions</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher.win32.win32.x86</artifactId>
-			<version>1.1.800.v20180827-1352</version>
+			<artifactId>com.ibm.icu</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher.cocoa.macosx.x86_64</artifactId>
-			<version>1.1.800.v20180827-1352</version>
+			<artifactId>org.eclipse.e4.ui.css.swt</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.felix.gogo.runtime</artifactId>
-			<version>1.1.0.v20180713-1646</version>
+			<artifactId>org.eclipse.e4.ui.swt.gtk</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.emf.xpath</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.eclipse.core.databinding.observable</artifactId>
-			<version>1.6.300.v20180827-2028</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.eclipse.rcp</artifactId>
-			<version>4.9.100.v20180906-0745</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.launcher.win32.win32.x86_64</artifactId>
-			<version>1.1.800.v20180827-1352</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.eclipse.help</artifactId>
-			<version>3.8.200.v20180821-0700</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId>
-			<version>0.14.300.v20180828-0227</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
 			<artifactId>org.w3c.dom.smil</artifactId>
-			<version>1.0.1.v200903091627</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.eclipse.core.databinding.property</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.apache.commons.io</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.databinding.property</artifactId>
-			<version>1.6.300.v20180827-2028</version>
+			<artifactId>org.eclipse.e4.ui.di</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.commons.io</artifactId>
-			<version>2.2.0.v201405211200</version>
+			<artifactId>org.eclipse.e4.ui.dialogs</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.w3c.dom.events</artifactId>
-			<version>3.0.0.draft20060413_v201105210656</version>
+			<artifactId>org.eclipse.e4.core.di.extensions</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.di</artifactId>
-			<version>1.2.300.v20180906-1121</version>
+			<artifactId>org.eclipse.equinox.bidi</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.dialogs</artifactId>
-			<version>1.1.300.v20180828-0227</version>
+			<artifactId>org.eclipse.e4.core.di.annotations</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.apache.commons.logging</artifactId> -->
+		<!-- <version>1.2.0.v20180409-1502</version> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.apache.felix.gogo.command</artifactId> -->
+		<!-- <version>1.0.2.v20170914-1324</version> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.extensions</artifactId>
-			<version>0.15.200.v20180817-1215</version>
+			<artifactId>org.eclipse.e4.ui.workbench3</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.equinox.bidi</artifactId>
-			<version>1.1.200.v20180827-1235</version>
+			<artifactId>org.eclipse.core.jobs</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.annotations</artifactId>
-			<version>1.6.200.v20180817-1215</version>
+			<artifactId>org.eclipse.e4.core.contexts</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.commons.logging</artifactId>
-			<version>1.2.0.v20180409-1502</version>
+			<artifactId>org.eclipse.core.databinding.beans</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.felix.gogo.command</artifactId>
-			<version>1.0.2.v20170914-1324</version>
+			<artifactId>org.eclipse.e4.ui.css.core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.workbench3</artifactId>
-			<version>0.14.200.v20180828-0227</version>
+			<artifactId>org.eclipse.ui.workbench</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.jobs</artifactId>
-			<version>3.10.100.v20180817-1215</version>
+			<artifactId>org.eclipse.core.commands</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.commons.jxpath</artifactId>
-			<version>1.3.0.v200911051830</version>
+			<artifactId>org.eclipse.e4.ui.services</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.core.contexts</artifactId>
-			<version>1.7.100.v20180817-1215</version>
+			<artifactId>org.eclipse.ui</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.eclipse.e4.ui.workbench</artifactId>
 		</dependency>
+
+		<!-- Platform dependent -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.databinding.beans</artifactId>
-			<version>1.4.200.v20180827-2028</version>
+			<artifactId>org.eclipse.e4.ui.workbench.renderers.swt.cocoa</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.css.core</artifactId>
-			<version>0.12.300.v20180828-0227</version>
+			<artifactId>org.eclipse.ui.cocoa</artifactId>
 		</dependency>
+
+		<!-- Third party -->
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.ui.workbench</artifactId>
-			<version>3.112.0.v20180906-1121</version>
+			<artifactId>org.w3c.css.sac</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.win32.win32.x86_64</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.w3c.dom.svg</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.batik.util</artifactId>
-			<version>1.10.0.v20180703-1553</version>
+			<artifactId>org.w3c.dom.events</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.core.commands</artifactId>
-			<version>3.9.200.v20180827-1727</version>
+			<artifactId>org.apache.xmlgraphics</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.services</artifactId>
-			<version>1.3.200.v20180906-1121</version>
+			<artifactId>org.apache.commons.jxpath</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.ui</artifactId>
-			<version>3.110.0.v20180828-1350</version>
+			<artifactId>org.apache.batik.util</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.apache.xmlgraphics</artifactId>
-			<version>2.2.0.v20180809-1640</version>
+			<artifactId>org.apache.batik.i18n</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.workbench.renderers.swt.cocoa</artifactId>
-			<version>0.12.100.v20180828-0227</version>
+			<artifactId>org.apache.batik.css</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt.gtk.linux.ppc64le</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.apache.batik.constants</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.workbench</artifactId>
-			<version>1.7.0.v20180906-1121</version>
+			<artifactId>org.apache.felix.gogo.runtime</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rcp.e4</groupId>
-			<artifactId>org.eclipse.swt</artifactId>
-			<version>3.108.0.v20180904-1901</version>
+			<artifactId>org.apache.felix.scr</artifactId>
 		</dependency>
 
+
 		<!-- RCP -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp</groupId> -->
@@ -602,7 +542,45 @@
 		<!-- </exclusions> -->
 		<!-- </dependency> -->
 
-		<!-- From RAP -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.di</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.model.workbench</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.contexts</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.services</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.annotations</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.ui.services</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.rcp.e4</groupId> -->
+		<!-- <artifactId>org.eclipse.e4.core.di.extensions</artifactId> -->
+		<!-- </dependency> -->
+
+		<!-- Taking EMF from RAP -->
+		<!-- FIXME investigate why we have to -->
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.emf.common</artifactId>
@@ -619,47 +597,10 @@
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.emf.ecore.xmi</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.di</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.extensions.supplier</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.model.workbench</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.e4.emf.xpath</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.contexts</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.services</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.ui.services</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.e4.core.di.extensions</artifactId>
-		</dependency>
 
 
 	</dependencies>
@@ -669,6 +610,7 @@
 				<groupId>org.argeo.tp</groupId>
 				<artifactId>argeo-tp-rcp-e4</artifactId>
 				<version>${version.argeo-tp}</version>
+				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>