From 7775f5978bc0a89991dcbed3d07b0385ec31f5dc Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 10 Jan 2021 13:25:20 +0100
Subject: [PATCH] update product version numbers in pom and reduce feature
 product size

---
 .../com.minres.scviewer.e4.feature/feature.xml   |  2 --
 .../feature.xml                                  |  3 +++
 products/com.minres.scviewer.e4.product/pom.xml  |  2 +-
 .../scviewer.product                             | 16 ++++++++++++++++
 .../com.minres.scviewer.e4.product_slim/pom.xml  |  2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/features/com.minres.scviewer.e4.feature/feature.xml b/features/com.minres.scviewer.e4.feature/feature.xml
index 3a87b7d..1177cb4 100644
--- a/features/com.minres.scviewer.e4.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.feature/feature.xml
@@ -44,8 +44,6 @@
       <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
       <import feature="com.opcoach.e4.preferences.feature" version="1.3.0.202004072127"/>
       <import feature="org.eclipse.equinox.executable" version="3.8.700.v20200207-2156"/>
-      <import feature="org.eclipse.equinox.sdk" version="3.20.100.v20200303-1901"/>
-      <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
       <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
       <import plugin="org.eclipse.core.commands"/>
       <import feature="com.minres.scviewer.database.feature" version="3.0.0.qualifier"/>
diff --git a/features/com.minres.scviewer.e4.platform.feature/feature.xml b/features/com.minres.scviewer.e4.platform.feature/feature.xml
index af86167..574cc69 100644
--- a/features/com.minres.scviewer.e4.platform.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.platform.feature/feature.xml
@@ -33,6 +33,9 @@
       <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.osgi" version="3.2.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml
index f0ac7ff..db698e7 100644
--- a/products/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.10.0-SNAPSHOT</version>
+  	<version>2.11.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product
index e117531..4aca6ee 100644
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@@ -50,6 +50,22 @@
       <feature id="com.minres.scviewer.e4.feature" installMode="root"/>
       <feature id="com.minres.scviewer.e4.platform.feature" installMode="root"/>
       <feature id="org.eclipse.equinox.p2.core.feature" installMode="root"/>
+      <feature id="org.eclipse.emf.ecore" installMode="root"/>
+      <feature id="org.eclipse.rcptt.core" installMode="root"/>
+      <feature id="org.eclipse.emf.common" installMode="root"/>
+      <feature id="org.eclipse.ecf.core.feature" installMode="root"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" installMode="root"/>
+      <feature id="org.eclipse.rcptt.ecl.core" installMode="root"/>
+      <feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
+      <feature id="org.eclipse.rcptt.tesla" installMode="root"/>
+      <feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
+      <feature id="com.minres.scviewer.ui.feature" installMode="root"/>
+      <feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
+      <feature id="org.eclipse.rcptt.tesla.ecl" installMode="root"/>
+      <feature id="org.eclipse.equinox.executable" installMode="root"/>
+      <feature id="com.minres.scviewer.database.feature" installMode="root"/>
+      <feature id="org.eclipse.e4.rcp" installMode="root"/>
+      <feature id="com.opcoach.e4.preferences.feature" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/products/com.minres.scviewer.e4.product_slim/pom.xml b/products/com.minres.scviewer.e4.product_slim/pom.xml
index e241edc..a3ce16b 100644
--- a/products/com.minres.scviewer.e4.product_slim/pom.xml
+++ b/products/com.minres.scviewer.e4.product_slim/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product_slim</artifactId>
-  	<version>2.10.0-SNAPSHOT</version>
+  	<version>2.11.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>