diff --git a/.gitignore b/.gitignore
index 9282123..2f5cce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@
 .DS_Store
 *.ear
 *.war
+**/apidocs/
+!**/apidocs/README.txt
 
 **/*.actionbin
 **/*.blipbin
diff --git a/org.eclipse.osbp.dependencies.feature.apache.commons/feature.xml b/org.eclipse.osbp.dependencies.feature.apache.commons/feature.xml
index 227d62c..7092a34 100644
--- a/org.eclipse.osbp.dependencies.feature.apache.commons/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.apache.commons/feature.xml
@@ -20,6 +20,13 @@
    </license>
 
    <plugin
+         id="org.apache.poi"
+         download-size="0"
+         install-size="0"
+         version="3.9.0.v201405241750"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.commons.beanutils"
          download-size="0"
          install-size="0"
@@ -37,7 +44,7 @@
          id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
-         version="1.10.0"
+         version="1.10.0.v20180409-1845"
          unpack="false"/>
 
    <plugin
@@ -163,7 +170,7 @@
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
-         version="1.2.0"
+         version="1.2.0.v20180409-1502"
          unpack="false"/>
 
    <plugin
diff --git a/org.eclipse.osbp.dependencies.feature.apache.commons/pom.xml b/org.eclipse.osbp.dependencies.feature.apache.commons/pom.xml
index 437dbb3..8a7abdc 100644
--- a/org.eclipse.osbp.dependencies.feature.apache.commons/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.apache.commons/pom.xml
@@ -2,11 +2,11 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2011, 2016 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License 2.0  -->
+<!--# are made available under the terms of the Eclipse Public License 2.0 -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# https://www.eclipse.org/legal/epl-2.0/    -->
-<!--#                                           -->
-<!--# SPDX-License-Identifier: EPL-2.0          -->
+<!--# https://www.eclipse.org/legal/epl-2.0/ -->
+<!--# -->
+<!--# SPDX-License-Identifier: EPL-2.0 -->
 <!--# -->
 <!--# Contributors: -->
 <!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
@@ -24,6 +24,16 @@
 	<artifactId>org.eclipse.osbp.dependencies.feature.apache.commons</artifactId>
 	<packaging>eclipse-feature</packaging>
 
+	<repositories>
+		<repository>
+			<name>Eclipse Orbit Composite Site R20190226160451 (2019-03)</name>
+			<id>Eclipse Orbit Composite Site R20190226160451</id>
+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+	
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -44,6 +54,7 @@
 					<excludes>
 						<plugin id="commons-vfs-osgi" />
 						<plugin id="jackrabbit-webdav-osgi" />
+						<plugin id="com.springsource.org.apache.poi" />
 						<plugin id="org.apache.commons.beanutils" />
 						<plugin id="org.apache.commons.beanutils.source" />
 						<plugin id="org.apache.commons.cli" />
@@ -120,11 +131,8 @@
 		</dependency>
 
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12846 -->
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version><!--$NO-MVN-MAN-VER$ -->
-		</dependency>
+		<!-- artifactId: org.apache.commons.codec -->
+		<!-- version: 1.10.0.v20180409-1845 -->
 
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12657 -->
 		<dependency>
@@ -187,17 +195,14 @@
 		<!-- https://mvnrepository.com/artifact/commons-math/commons-math -->
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15197 -->
 		<dependency>
-		    <groupId>commons-math</groupId>
-		    <artifactId>commons-math</artifactId>
-		    <version>1.2</version>
+			<groupId>commons-math</groupId>
+			<artifactId>commons-math</artifactId>
+			<version>1.2</version>
 		</dependency>
 
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12688 -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
-		</dependency>
+		<!-- artifactId: commons-logging -->
+		<!-- version: 1.2.0.v20180409-1502 -->
 
 		<dependency>
 			<groupId>org.eclipse.osbp.dependencies</groupId>
@@ -226,5 +231,10 @@
 			</artifactId>
 			<version>2.3.3-SNAPSHOT</version>
 		</dependency>
+
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19060 -->
+		<!-- artifactId: org.apache.poi -->
+		<!-- version: 3.9.0.v201405241750 -->
+
 	</dependencies>
 </project>
diff --git a/org.eclipse.osbp.dependencies.feature.apache.cxf/feature.xml b/org.eclipse.osbp.dependencies.feature.apache.cxf/feature.xml
index b750a66..8a910b6 100644
--- a/org.eclipse.osbp.dependencies.feature.apache.cxf/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.apache.cxf/feature.xml
@@ -3,7 +3,8 @@
       id="org.eclipse.osbp.dependencies.feature.apache.cxf"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="org.apache.cxf.cxf-core">
 
    <description>
       %description
@@ -46,6 +47,13 @@
          unpack="false"/>
 
    <plugin
+         id="org.apache.cxf.cxf-rt-frontend-jaxrs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.cxf.cxf-rt-frontend-jaxws"
          download-size="0"
          install-size="0"
@@ -60,6 +68,20 @@
          unpack="false"/>
 
    <plugin
+         id="org.apache.cxf.cxf-rt-rs-client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="org.apache.cxf.cxf-rt-security"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.cxf.cxf-rt-transports-http"
          download-size="0"
          install-size="0"
@@ -87,4 +109,25 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.xml.soap"
+         download-size="0"
+         install-size="0"
+         version="1.3.0.v201105210645"
+         unpack="false"/>
+
+   <plugin
+         id="javax.activation"
+         download-size="0"
+         install-size="0"
+         version="1.1.0.v201211130549"
+         unpack="false"/>
+
+   <plugin
+         id="javax.ws.rs-api"
+         download-size="0"
+         install-size="0"
+         version="2.1"
+         unpack="false"/>
+
 </feature>
diff --git a/org.eclipse.osbp.dependencies.feature.apache.cxf/pom.xml b/org.eclipse.osbp.dependencies.feature.apache.cxf/pom.xml
index a7f848c..361c8c2 100644
--- a/org.eclipse.osbp.dependencies.feature.apache.cxf/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.apache.cxf/pom.xml
@@ -2,14 +2,14 @@
 <!--#======================================================================= -->
 <!--# Copyright (c) 2017 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
 <!--# All rights reserved. This program and the accompanying materials -->
-<!--# are made available under the terms of the Eclipse Public License 2.0  -->
+<!--# are made available under the terms of the Eclipse Public License 2.0 -->
 <!--# which accompanies this distribution, and is available at -->
-<!--# https://www.eclipse.org/legal/epl-2.0/    -->
-<!--#                                           -->
-<!--# SPDX-License-Identifier: EPL-2.0          -->
+<!--# https://www.eclipse.org/legal/epl-2.0/ -->
+<!--# -->
+<!--# SPDX-License-Identifier: EPL-2.0 -->
 <!--# -->
 <!--# Contributors: -->
-<!--# 	Loetz GmbH&Co.KG - initial API and implementation -->
+<!--# Loetz GmbH&Co.KG - initial API and implementation -->
 <!--#======================================================================= -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -25,17 +25,16 @@
 
 	<artifactId>org.eclipse.osbp.dependencies.feature.apache.cxf</artifactId>
 	<packaging>eclipse-feature</packaging>
-	
+
 	<properties>
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=14088 from ecd.dirigible, we need to create our own -->
-		<cxf-version>3.1.11</cxf-version>
+		<cxf-version>3.3.0</cxf-version>
 	</properties>
 
-    <repositories>
-    </repositories>
+	<repositories>
+	</repositories>
 
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/org.apache.cxf/cxf-core -->
+		<!-- CQ: http://dev.eclipse.org/ipzilla/show_bug.cgi?id=19446 -->
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-core</artifactId>
@@ -43,97 +42,232 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-core</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19447 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-soap</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-bindings-soap</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19448 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-bindings-xml</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-bindings-xml</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19449 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-databinding-jaxb</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-databinding-jaxb</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19450 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19451 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19452 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-frontend-simple</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-simple</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19453 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19459 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-security</artifactId>
+			<version>${cxf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-security</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19454 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19455 -->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-wsdl</artifactId>
 			<version>${cxf-version}</version>
 		</dependency>
 		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-wsdl</artifactId>
+			<version>${cxf-version}</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12909 -->
+		<dependency>
 			<groupId>org.apache.servicemix.bundles</groupId>
 			<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
 			<version>1.6.3_1</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.ws.xmlschema</groupId>
-			<version>2.2.1</version>
-			<artifactId>xmlschema-core</artifactId>
+			<groupId>org.apache.servicemix.bundles</groupId>
+			<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+			<version>1.6.3_1</version>
+			<classifier>sources</classifier>
 		</dependency>
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19456 -->
+		<dependency>
+			<groupId>org.apache.ws.xmlschema</groupId>
+			<artifactId>xmlschema-core</artifactId>
+			<version>2.2.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ws.xmlschema</groupId>
+			<artifactId>xmlschema-core</artifactId>
+			<version>2.2.1</version>
+			<classifier>sources</classifier>
+		</dependency>
+
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19457 -->
+		<!-- artefactid: javax.xml.soap -->
+		<!-- version: 1.3.0.v201105210645 -->
+
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19458 -->
+		<!-- artefactid: javax.activation -->
+		<!-- version: 1.1.0.v201211130549 -->
+
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19462 -->
+		<dependency>
+		    <groupId>javax.ws.rs</groupId>
+		    <artifactId>javax.ws.rs-api</artifactId>
+		    <version>2.1</version>
+		</dependency>
+		<dependency>
+		    <groupId>javax.ws.rs</groupId>
+		    <artifactId>javax.ws.rs-api</artifactId>
+		    <version>2.1</version>
+			<classifier>sources</classifier>
+		</dependency>
+
+
 	</dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho.extras</groupId>
-                <artifactId>tycho-source-feature-plugin</artifactId>
-                <version>${tychoExtrasVersion}</version>
-                <executions>
-                    <execution>
-                        <id>source-feature</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>source-feature</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <labelSuffix> (source)</labelSuffix> 
-                    <excludes>
-                         <plugin id="org.apache.cxf.cxf-core"/>
-                         <plugin id="org.apache.cxf.cxf-rt-bindings-soap"/>
-                         <plugin id="org.apache.cxf.cxf-rt-bindings-xml"/>
-                         <plugin id="org.apache.cxf.cxf-rt-databinding-jaxb"/>
-                         <plugin id="org.apache.cxf.cxf-rt-frontend-jaxws"/>
-                         <plugin id="org.apache.cxf.cxf-rt-frontend-simple"/>
-                         <plugin id="org.apache.cxf.cxf-rt-transports-http"/>
-                         <plugin id="org.apache.cxf.cxf-rt-wsdl"/>
-                         <plugin id="org.apache.servicemix.bundles.wsdl4j"/>
-                         <plugin id="org.apache.ws.xmlschema.core"/>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- workaround while bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=398250 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<labelSuffix> (source)</labelSuffix>
+					<excludes>
+						<plugin id="org.apache.cxf.cxf-core" />
+						<plugin id="org.apache.cxf.cxf-rt-bindings-soap" />
+						<plugin id="org.apache.cxf.cxf-rt-bindings-xml" />
+						<plugin id="org.apache.cxf.cxf-rt-databinding-jaxb" />
+						<plugin id="org.apache.cxf.cxf-rt-frontend-jaxws" />
+						<plugin id="org.apache.cxf.cxf-rt-frontend-simple" />
+						<plugin id="org.apache.cxf.cxf-rt-security" />
+						<plugin id="org.apache.cxf.cxf-rt-transports-http" />
+						<plugin id="org.apache.cxf.cxf-rt-wsdl" />
+						<plugin id="org.apache.cxf.cxf-rt-frontend-jaxrs" />
+						<plugin id="org.apache.cxf.cxf-rt-rs-client" />
+						<plugin id="org.apache.servicemix.bundles.wsdl4j" />
+						<plugin id="org.apache.ws.xmlschema.core" />
+						<plugin id="javax.xml.soap" />
+						<plugin id="javax.ws.rs-api" />
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!-- workaround while bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=398250 
 					is not fixed -->
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-p2-plugin</artifactId>
-                <version>${tycho-version}</version>
-                <executions>
-                    <execution>
-                        <id>attached-p2-metadata</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-metadata</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attached-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/org.eclipse.osbp.dependencies.feature.assert_utilities/feature.xml b/org.eclipse.osbp.dependencies.feature.assert_utilities/feature.xml
index d10a827..4d7f1a5 100644
--- a/org.eclipse.osbp.dependencies.feature.assert_utilities/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.assert_utilities/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"
       version="1.3.0.qualifier"
       provider-name="%providerName"
-      plugin="org.knowhowlab.osgi.testing.assertions">
+      plugin="org.eclipse.osbp.license">
 
    <description>
       %description
@@ -64,7 +64,7 @@
          id="javax.validation.api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.1.Final"
          unpack="false"/>
 
    <plugin
diff --git a/org.eclipse.osbp.dependencies.feature.assert_utilities/pom.xml b/org.eclipse.osbp.dependencies.feature.assert_utilities/pom.xml
index ba6b6ff..183e632 100644
--- a/org.eclipse.osbp.dependencies.feature.assert_utilities/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.assert_utilities/pom.xml
@@ -79,12 +79,15 @@
         <!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12092 -->
         <!-- com.google.guava 18.0.0.v20161115-1643 from Orbit -->
         
-        <!-- CQ:  https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15158 -->
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
+	
+		<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+        <!-- CQ:  https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19218 -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>2.0.1.Final</version>
+		</dependency>
+
         
         <!-- CQ:  https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12718 -->
         <!-- org.hamcrest.core 1.3.0.v201303031735 from Orbit -->
diff --git a/org.eclipse.osbp.dependencies.feature.e4tools.runtime/feature.xml b/org.eclipse.osbp.dependencies.feature.e4tools.runtime/feature.xml
index 5182817..779a86f 100644
--- a/org.eclipse.osbp.dependencies.feature.e4tools.runtime/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.e4tools.runtime/feature.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--#======================================================================= -->
 <feature
       id="org.eclipse.osbp.dependencies.feature.e4tools.runtime"
       label="%featureName"
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.core/feature.xml b/org.eclipse.osbp.dependencies.feature.eclipse.core/feature.xml
index 8d982bc..ddf20d4 100644
--- a/org.eclipse.osbp.dependencies.feature.eclipse.core/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.core/feature.xml
@@ -5,8 +5,7 @@
       label="%featureName"
       version="0.9.0.qualifier"
       provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
+	  plugin="org.eclipse.osbp.license">
 
    <description>
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.osbp.releng.dependency.feature.autoupdate b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.osbp.releng.dependency.feature.autoupdate
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.osbp.releng.dependency.feature.autoupdate
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.project b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.project
new file mode 100644
index 0000000..5b1ec32
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.osbp.dependencies.feature.eclipse.ecf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..5da8aa3
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,10 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/LICENSE.txt b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/LICENSE.txt
new file mode 100644
index 0000000..fc5938d
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/LICENSE.txt
@@ -0,0 +1,140 @@
+Eclipse Foundation Software User Agreement
+
+November 22, 2017
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the Eclipse Foundation
+is provided to you under the terms and conditions of the Eclipse Public License
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,
+"Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code, documentation
+and other files maintained in the Eclipse Foundation source code repository
+("Repository") in software modules ("Modules") and made available as
+downloadable archives ("Downloads").
+
+-   Content may be structured and packaged into modules to facilitate
+    delivering, extending, and upgrading the Content. Typical modules may
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and
+    features ("Features").
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR
+    (Java™ ARchive) in a directory named "plugins".
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and
+    associated material. Each Feature may be packaged as a sub-directory in a
+    directory named "features". Within a Feature, files named "feature.xml" may
+    contain a list of the names and version numbers of the Plug-ins and/or
+    Fragments associated with that Feature.
+-   Features may also include other Features ("Included Features"). Within a
+    Feature, files named "feature.xml" may contain a list of the names and
+    version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be contained in
+files named "about.html" ("Abouts"). The terms and conditions governing Features
+and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:
+
+-   The top-level (root) directory
+-   Plug-in and Fragment directories
+-   Inside Plug-ins and Fragments packaged as JARs
+-   Sub-directories of the directory named "src" of certain Plug-ins
+-   Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using
+the Provisioning Technology (as defined below), you must agree to a license
+("Feature Update License") during the installation process. If the Feature
+contains Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform you
+where you can locate them. Feature Update Licenses may be found in the "license"
+property of files named "feature.properties" found within a Feature. Such
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and
+conditions (or references to such terms and conditions) that govern your use of
+the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+-   Eclipse Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/epl-v10.html)
+-   Eclipse Distribution License Version 1.0 (available at
+    http://www.eclipse.org/licenses/edl-v1.0.html)
+-   Common Public License Version 1.0 (available at
+    http://www.eclipse.org/legal/cpl-v10.html)
+-   Apache Software License 1.1 (available at
+    http://www.apache.org/licenses/LICENSE)
+-   Apache Software License 2.0 (available at
+    http://www.apache.org/licenses/LICENSE-2.0)
+-   Mozilla Public License Version 1.1 (available at
+    http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which
+include, but are not limited to, p2 and the Eclipse Update Manager
+("Provisioning Technology") for the purpose of allowing users to install
+software, documentation, information and/or other materials (collectively
+"Installable Software"). This capability is provided with the intent of allowing
+such users to install, extend and update Eclipse-based products. Information
+about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install
+Installable Software. You shall be responsible for enabling the applicable
+license agreements relating to the Installable Software to be presented to, and
+accepted by, the users of the Provisioning Technology in accordance with the
+Specification. By using Provisioning Technology in such a manner and making it
+available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the
+following:
+
+1.  A series of actions may occur ("Provisioning Process") in which a user may
+    execute the Provisioning Technology on a machine ("Target Machine") with the
+    intent of installing, extending or updating the functionality of an
+    Eclipse-based product.
+2.  During the Provisioning Process, the Provisioning Technology may cause third
+    party Installable Software or a portion thereof to be accessed and copied to
+    the Target Machine.
+3.  Pursuant to the Specification, you will provide to the user the terms and
+    conditions that govern the use of the Installable Software ("Installable
+    Software Agreement") and such Installable Software Agreement shall be
+    accessed from the Target Machine in accordance with the Specification. Such
+    Installable Software Agreement must inform the user of the terms and
+    conditions that govern the Installable Software and must solicit acceptance
+    by the end user in the manner prescribed in such Installable
+    Software Agreement. Upon such indication of agreement by the user, the
+    provisioning Technology will complete installation of the
+    Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the
+United States, other countries, or both.
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/build.properties b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/build.properties
new file mode 100644
index 0000000..d6b1b0a
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/build.properties
@@ -0,0 +1,2 @@
+bin.includes = license.html,  epl-2.0.html,  feature.xml,\
+               feature.properties
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/epl-2.0.html b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.properties b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.properties
new file mode 100644
index 0000000..98d8038
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.properties
@@ -0,0 +1,190 @@
+###############################################################################
+# Copyright (c) 2019 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany).
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0 
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#     Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName =OSBP dependencies: Eclipse ECF 
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse OSBP
+
+# "description" property - description of the feature
+description=This feature provides the Eclipse ECF bundles for OSBP.
+
+# "updateSiteName" property - label for the update site
+updateSiteName=
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2019 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany) \n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License 2.0 \n\
+which accompanies this distribution, and is available at\n\
+https://www.eclipse.org/legal/epl-2.0/
+
+SPDX-License-Identifier: EPL-2.0\n\
+\n\
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+Eclipse Foundation Software User Agreement\n\
+\n\
+November 22, 2017\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
+MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public License\n\
+Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
+available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
+"Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code, documentation\n\
+and other files maintained in the Eclipse Foundation source code repository\n\
+("Repository") in software modules ("Modules") and made available as\n\
+downloadable archives ("Downloads").\n\
+\n\
+-   Content may be structured and packaged into modules to facilitate\n\
+    delivering, extending, and upgrading the Content. Typical modules may\n\
+    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
+    features ("Features").\n\
+-   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
+    (Java™ ARchive) in a directory named "plugins".\n\
+-   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
+    associated material. Each Feature may be packaged as a sub-directory in a\n\
+    directory named "features". Within a Feature, files named "feature.xml" may\n\
+    contain a list of the names and version numbers of the Plug-ins and/or\n\
+    Fragments associated with that Feature.\n\
+-   Features may also include other Features ("Included Features"). Within a\n\
+    Feature, files named "feature.xml" may contain a list of the names and\n\
+    version numbers of Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be contained in\n\
+files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
+and Included Features should be contained in files named "license.html"\n\
+("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
+directory of a Download or Module including, but not limited to the following\n\
+locations:\n\
+\n\
+-   The top-level (root) directory\n\
+-   Plug-in and Fragment directories\n\
+-   Inside Plug-ins and Fragments packaged as JARs\n\
+-   Sub-directories of the directory named "src" of certain Plug-ins\n\
+-   Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using\n\
+the Provisioning Technology (as defined below), you must agree to a license\n\
+("Feature Update License") during the installation process. If the Feature\n\
+contains Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform you\n\
+where you can locate them. Feature Update Licenses may be found in the "license"\n\
+property of files named "feature.properties" found within a Feature. Such\n\
+Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your use of\n\
+the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+-   Eclipse Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/epl-v10.html)\n\
+-   Eclipse Distribution License Version 1.0 (available at\n\
+    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
+-   Common Public License Version 1.0 (available at\n\
+    http://www.eclipse.org/legal/cpl-v10.html)\n\
+-   Apache Software License 1.1 (available at\n\
+    http://www.apache.org/licenses/LICENSE)\n\
+-   Apache Software License 2.0 (available at\n\
+    http://www.apache.org/licenses/LICENSE-2.0)\n\
+-   Mozilla Public License Version 1.1 (available at\n\
+    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
+USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
+provided, please contact the Eclipse Foundation to determine what terms and\n\
+conditions govern that particular Content.\n\
+\n\
+Use of Provisioning Technology\n\
+\n\
+The Eclipse Foundation makes available provisioning software, examples of which\n\
+include, but are not limited to, p2 and the Eclipse Update Manager\n\
+("Provisioning Technology") for the purpose of allowing users to install\n\
+software, documentation, information and/or other materials (collectively\n\
+"Installable Software"). This capability is provided with the intent of allowing\n\
+such users to install, extend and update Eclipse-based products. Information\n\
+about packaging Installable Software is available at\n\
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
+\n\
+You may use Provisioning Technology to allow other parties to install\n\
+Installable Software. You shall be responsible for enabling the applicable\n\
+license agreements relating to the Installable Software to be presented to, and\n\
+accepted by, the users of the Provisioning Technology in accordance with the\n\
+Specification. By using Provisioning Technology in such a manner and making it\n\
+available in accordance with the Specification, you further acknowledge your\n\
+agreement to, and the acquisition of all necessary rights to permit the\n\
+following:\n\
+\n\
+1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
+    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
+    intent of installing, extending or updating the functionality of an\n\
+    Eclipse-based product.\n\
+2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
+    party Installable Software or a portion thereof to be accessed and copied to\n\
+    the Target Machine.\n\
+3.  Pursuant to the Specification, you will provide to the user the terms and\n\
+    conditions that govern the use of the Installable Software ("Installable\n\
+    Software Agreement") and such Installable Software Agreement shall be\n\
+    accessed from the Target Machine in accordance with the Specification. Such\n\
+    Installable Software Agreement must inform the user of the terms and\n\
+    conditions that govern the Installable Software and must solicit acceptance\n\
+    by the end user in the manner prescribed in such Installable\n\
+    Software Agreement. Upon such indication of agreement by the user, the\n\
+    provisioning Technology will complete installation of the\n\
+    Installable Software.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are currently\n\
+may have restrictions on the import, possession, and use, and/or re-export to\n\
+another country, of encryption software. BEFORE using any encryption software,\n\
+please check the country's laws, regulations and policies concerning the import,\n\
+possession, or use, and re-export of encryption software, to see if this is\n\
+permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
+United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.xml b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.xml
new file mode 100644
index 0000000..7044a85
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/feature.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<feature
+      id="org.eclipse.osbp.dependencies.feature.eclipse.ecf"
+      label="%featureName"
+      version="0.9.0.qualifier"
+      provider-name="%providerName"
+	  plugin="org.eclipse.osbp.license">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.ecf.core.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.core.ssl.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.ssl.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.httpclient4.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="3.9.3.v20181012-2016"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.console"
+         download-size="0"
+         install-size="0"
+         version="1.3.0.v20180713-1805"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.discovery"
+         download-size="0"
+         install-size="0"
+         version="5.0.300.v20180306-0211"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="3.9.1.v20180810-0833"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.osgi.services.distribution"
+         download-size="0"
+         install-size="0"
+         version="2.1.200.v20180301-0016"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.osgi.services.remoteserviceadmin"
+         download-size="0"
+         install-size="0"
+         version="4.6.1100.v20180920-1931"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console"
+         download-size="0"
+         install-size="0"
+         version="1.2.0.v20180713-1805"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"
+         download-size="0"
+         install-size="0"
+         version="1.0.100.v20180301-0016"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.jmdns"
+         download-size="0"
+         install-size="0"
+         version="4.3.200.v20180306-0429"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.remoteservice"
+         download-size="0"
+         install-size="0"
+         version="8.13.1.v20180801-1752"
+         unpack="false"/>		 
+		 
+   <plugin
+         id="org.eclipse.ecf.remoteservice.asyncproxy"
+         download-size="0"
+         install-size="0"
+         version="2.1.0.v20180409-2248"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services.remoteserviceadmin"
+         download-size="0"
+         install-size="0"
+         version="1.6.200.v20180301-0016"
+         unpack="false"/>
+
+
+</feature>
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/license.html b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/license.html
new file mode 100644
index 0000000..008b801
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/license.html
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+	<h2>Eclipse Foundation Software User Agreement</h2>
+	<p>November 22, 2017</p>
+
+	<h3>Usage Of Content</h3>
+
+	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
+		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
+		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
+		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
+		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
+		USE THE CONTENT.</p>
+
+	<h3>Applicable Licenses</h3>
+
+	<p>
+		Unless otherwise indicated, all Content made available by the Eclipse
+		Foundation is provided to you under the terms and conditions of the
+		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
+		EPL is provided with this Content and is also available at <a
+			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>Content includes, but is not limited to, source code, object
+		code, documentation and other files maintained in the Eclipse
+		Foundation source code repository (&quot;Repository&quot;) in software
+		modules (&quot;Modules&quot;) and made available as downloadable
+		archives (&quot;Downloads&quot;).</p>
+
+	<ul>
+		<li>Content may be structured and packaged into modules to
+			facilitate delivering, extending, and upgrading the Content. Typical
+			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
+			fragments (&quot;Fragments&quot;), and features
+			(&quot;Features&quot;).</li>
+		<li>Each Plug-in or Fragment may be packaged as a sub-directory
+			or JAR (Java&trade; ARchive) in a directory named
+			&quot;plugins&quot;.</li>
+		<li>A Feature is a bundle of one or more Plug-ins and/or
+			Fragments and associated material. Each Feature may be packaged as a
+			sub-directory in a directory named &quot;features&quot;. Within a
+			Feature, files named &quot;feature.xml&quot; may contain a list of
+			the names and version numbers of the Plug-ins and/or Fragments
+			associated with that Feature.</li>
+		<li>Features may also include other Features (&quot;Included
+			Features&quot;). Within a Feature, files named
+			&quot;feature.xml&quot; may contain a list of the names and version
+			numbers of Included Features.</li>
+	</ul>
+
+	<p>The terms and conditions governing Plug-ins and Fragments should
+		be contained in files named &quot;about.html&quot;
+		(&quot;Abouts&quot;). The terms and conditions governing Features and
+		Included Features should be contained in files named
+		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
+		Feature Licenses may be located in any directory of a Download or
+		Module including, but not limited to the following locations:</p>
+
+	<ul>
+		<li>The top-level (root) directory</li>
+		<li>Plug-in and Fragment directories</li>
+		<li>Inside Plug-ins and Fragments packaged as JARs</li>
+		<li>Sub-directories of the directory named &quot;src&quot; of
+			certain Plug-ins</li>
+		<li>Feature directories</li>
+	</ul>
+
+	<p>Note: if a Feature made available by the Eclipse Foundation is
+		installed using the Provisioning Technology (as defined below), you
+		must agree to a license (&quot;Feature Update License&quot;) during
+		the installation process. If the Feature contains Included Features,
+		the Feature Update License should either provide you with the terms
+		and conditions governing the Included Features or inform you where you
+		can locate them. Feature Update Licenses may be found in the
+		&quot;license&quot; property of files named
+		&quot;feature.properties&quot; found within a Feature. Such Abouts,
+		Feature Licenses, and Feature Update Licenses contain the terms and
+		conditions (or references to such terms and conditions) that govern
+		your use of the associated Content in that directory.</p>
+
+	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
+		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
+		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
+		ARE NOT LIMITED TO):</p>
+
+	<ul>
+		<li>Eclipse Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
+		</li>
+		<li>Eclipse Distribution License Version 1.0 (available at <a
+			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
+		</li>
+		<li>Common Public License Version 1.0 (available at <a
+			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
+		</li>
+		<li>Apache Software License 1.1 (available at <a
+			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
+		</li>
+		<li>Apache Software License 2.0 (available at <a
+			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
+		</li>
+		<li>Mozilla Public License Version 1.1 (available at <a
+			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
+		</li>
+	</ul>
+
+	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
+		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
+		or Feature Update License is provided, please contact the Eclipse
+		Foundation to determine what terms and conditions govern that
+		particular Content.</p>
+
+
+	<h3>Use of Provisioning Technology</h3>
+
+	<p>
+		The Eclipse Foundation makes available provisioning software, examples
+		of which include, but are not limited to, p2 and the Eclipse Update
+		Manager (&quot;Provisioning Technology&quot;) for the purpose of
+		allowing users to install software, documentation, information and/or
+		other materials (collectively &quot;Installable Software&quot;). This
+		capability is provided with the intent of allowing such users to
+		install, extend and update Eclipse-based products. Information about
+		packaging Installable Software is available at <a
+			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+		(&quot;Specification&quot;).
+	</p>
+
+	<p>You may use Provisioning Technology to allow other parties to
+		install Installable Software. You shall be responsible for enabling
+		the applicable license agreements relating to the Installable Software
+		to be presented to, and accepted by, the users of the Provisioning
+		Technology in accordance with the Specification. By using Provisioning
+		Technology in such a manner and making it available in accordance with
+		the Specification, you further acknowledge your agreement to, and the
+		acquisition of all necessary rights to permit the following:</p>
+
+	<ol>
+		<li>A series of actions may occur (&quot;Provisioning
+			Process&quot;) in which a user may execute the Provisioning
+			Technology on a machine (&quot;Target Machine&quot;) with the intent
+			of installing, extending or updating the functionality of an
+			Eclipse-based product.</li>
+		<li>During the Provisioning Process, the Provisioning Technology
+			may cause third party Installable Software or a portion thereof to be
+			accessed and copied to the Target Machine.</li>
+		<li>Pursuant to the Specification, you will provide to the user
+			the terms and conditions that govern the use of the Installable
+			Software (&quot;Installable Software Agreement&quot;) and such
+			Installable Software Agreement shall be accessed from the Target
+			Machine in accordance with the Specification. Such Installable
+			Software Agreement must inform the user of the terms and conditions
+			that govern the Installable Software and must solicit acceptance by
+			the end user in the manner prescribed in such Installable Software
+			Agreement. Upon such indication of agreement by the user, the
+			provisioning Technology will complete installation of the Installable
+			Software.</li>
+	</ol>
+
+	<h3>Cryptography</h3>
+
+	<p>Content may contain encryption software. The country in which
+		you are currently may have restrictions on the import, possession, and
+		use, and/or re-export to another country, of encryption software.
+		BEFORE using any encryption software, please check the country's laws,
+		regulations and policies concerning the import, possession, or use,
+		and re-export of encryption software, to see if this is permitted.</p>
+
+	<p>
+		<small>Java and all Java-based trademarks are trademarks of
+			Oracle Corporation in the United States, other countries, or both.</small>
+	</p>
+</body>
+</html>
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.ecf/pom.xml b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/pom.xml
new file mode 100644
index 0000000..2987aa6
--- /dev/null
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.ecf/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--#======================================================================= -->
+<!--# Copyright (c) 2019 - Loetz GmbH&Co.KG (69115 Heidelberg, Germany). -->
+<!--# All rights reserved. This program and the accompanying materials -->
+<!--# are made available under the terms of the Eclipse Public License 2.0  -->
+<!--# which accompanies this distribution, and is available at -->
+<!--# https://www.eclipse.org/legal/epl-2.0/    -->
+<!--#                                           -->
+<!--# SPDX-License-Identifier: EPL-2.0          -->
+<!--# -->
+<!--# Contributors: -->
+<!--# Christophe Loetz (Loetz GmbH&Co.KG) - initial API and implementation -->
+<!--#======================================================================= -->
+<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.eclipse.osbp.dependencies</groupId>
+		<artifactId>org.eclipse.osbp.dependencies</artifactId>
+		<version>0.9.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.osbp.dependencies.feature.eclipse.ecf</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<repositories>
+			<repository>
+			<id>Eclipse_ECF_3.14.4</id>
+			<name>Eclipse ECF 3.14.4</name>
+			<url>http://download.eclipse.org/rt/ecf/3.14.4/site.p2</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tychoExtrasVersion}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<labelSuffix> (source)</labelSuffix>
+					<excludes>
+<!-- 						<plugin id="org.eclipse.osgi.util" /> -->
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<!-- workaround while bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=398250 
+					is not fixed -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attached-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.emf/feature.xml b/org.eclipse.osbp.dependencies.feature.eclipse.emf/feature.xml
index e4b5daa..8252fe8 100644
--- a/org.eclipse.osbp.dependencies.feature.eclipse.emf/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.emf/feature.xml
@@ -5,8 +5,7 @@
       label="%featureName"
       version="0.9.0.qualifier"
       provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
+	  plugin="org.eclipse.osbp.license">
 
    <description>
       %description
@@ -24,133 +23,133 @@
          id="org.eclipse.emf.common"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.12.0.v20160420-0247"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.databinding"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.databinding.edit"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.12.0.v20160420-0247"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.change"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.11.0.v20160420-0247"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.change.edit"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.6.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.edit"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.9.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.xcore"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.4.0.v20160526-0606"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.xcore.lib"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.100.v20160526-0606"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.ecore.xmi"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.12.0.v20160420-0247"
          unpack="false"/>
         
    <plugin
          id="org.eclipse.emf.codegen"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.11.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.codegen.ecore"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.12.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.codegen.ecore.xtext"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.2.0.v20160526-0606"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.edit"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.12.0.v20160526-0356"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.mwe.core"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.20.v201605261103"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.mwe.utils"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.3.20.v201605261103"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.language"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.9.0.v201605261103"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.launch"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.9.0.v201605261103"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.emf.mwe2.runtime"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.9.0.v201605261103"
          unpack="false"/>
 
 </feature>
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.jdt/feature.xml b/org.eclipse.osbp.dependencies.feature.eclipse.jdt/feature.xml
index d202200..b9bf071 100644
--- a/org.eclipse.osbp.dependencies.feature.eclipse.jdt/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.jdt/feature.xml
@@ -5,8 +5,7 @@
       label="%featureName"
       version="0.9.0.qualifier"
       provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
+	  plugin="org.eclipse.osbp.license">
 
    <description>
       %description
@@ -45,14 +44,14 @@
          id="org.eclipse.jdt.debug"
          download-size="0"
          install-size="0"
-         version="3.10.1.v20160811-0441"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
          id="org.eclipse.jdt.launching"
          download-size="0"
          install-size="0"
-         version="3.8.101.v20161111-2014"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.persistence/feature.xml b/org.eclipse.osbp.dependencies.feature.eclipse.persistence/feature.xml
index 7e6ca08..47e5f86 100644
--- a/org.eclipse.osbp.dependencies.feature.eclipse.persistence/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.persistence/feature.xml
@@ -64,7 +64,7 @@
          id="javax.validation.api"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="2.0.1.Final"
          unpack="false"/>
 
    <plugin
diff --git a/org.eclipse.osbp.dependencies.feature.eclipse.persistence/pom.xml b/org.eclipse.osbp.dependencies.feature.eclipse.persistence/pom.xml
index 44d8559..b1a2ed8 100644
--- a/org.eclipse.osbp.dependencies.feature.eclipse.persistence/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.eclipse.persistence/pom.xml
@@ -49,6 +49,7 @@
             <artifactId>eclipselink</artifactId>
             <version>${eclipse.persistence.version}</version>
         </dependency>
+		
 		<!-- https://mvnrepository.com/artifact/org.eclipse.persistence/commonj.sdo -->
 		<dependency>
         	<!-- CQ: not needed, Eclipse bundle -->
@@ -65,12 +66,14 @@
         <!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15300 -->
         <!-- javax.xml.soap 1.2.0.v201005080501 -->
         
-        <dependency>
-        	<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15158 -->
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>1.1.0.Final</version>
-        </dependency>
+		<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+        <!-- CQ:  https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19218 -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>2.0.1.Final</version>
+		</dependency>
+		
         <dependency>
         	<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12714 -->
             <groupId>org.glassfish</groupId>
diff --git a/org.eclipse.osbp.dependencies.feature.equinox/feature.xml b/org.eclipse.osbp.dependencies.feature.equinox/feature.xml
index 0dc1068..0f1d723 100644
--- a/org.eclipse.osbp.dependencies.feature.equinox/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.equinox/feature.xml
@@ -5,9 +5,7 @@
       label="%featureName"
       version="0.9.0.qualifier"
       provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
+	  plugin="org.eclipse.osbp.license">
    <description>
       %description
    </description>
@@ -53,6 +51,13 @@
          version="0.0.0"/>
 
    <plugin
+         id="org.eclipse.equinox.util"
+         download-size="0"
+         install-size="0"
+         version="1.0.500.v20130404-1337"
+         unpack="false"/>
+		 
+   <plugin
          id="org.eclipse.equinox.bidi"
          download-size="0"
          install-size="0"
@@ -173,7 +178,7 @@
          version="0.0.0"
          fragment="true"
          unpack="false"/>
-
+		 
    <plugin
          id="org.tukaani.xz"
          download-size="0"
diff --git a/org.eclipse.osbp.dependencies.feature.gemini.jpa/feature.xml b/org.eclipse.osbp.dependencies.feature.gemini.jpa/feature.xml
index 2eaa7e6..e610cb3 100644
--- a/org.eclipse.osbp.dependencies.feature.gemini.jpa/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.gemini.jpa/feature.xml
@@ -5,7 +5,8 @@
       label="%featureName"
       version="1.1.0.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"
+	  plugin="org.eclipse.gemini.jpa">
 
    <description url="http://eclipse.org/gemini/jpa">
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.gemini.naming/feature.xml b/org.eclipse.osbp.dependencies.feature.gemini.naming/feature.xml
index ca480d3..dfcbf97 100644
--- a/org.eclipse.osbp.dependencies.feature.gemini.naming/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.gemini.naming/feature.xml
@@ -5,7 +5,8 @@
       label="%featureName"
       version="1.0.5.qualifier"
       provider-name="%providerName"
-      image="eclipse_update_120.jpg">
+      image="eclipse_update_120.jpg"
+	  plugin="org.eclipse.osbp.license">
 
    <description url="http://eclipse.org/gemini/naming">
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.jackson.core/feature.xml b/org.eclipse.osbp.dependencies.feature.jackson.core/feature.xml
index e2c4b03..08322c2 100644
--- a/org.eclipse.osbp.dependencies.feature.jackson.core/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.jackson.core/feature.xml
@@ -3,7 +3,8 @@
       id="org.eclipse.osbp.dependencies.feature.jackson.core"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="com.fasterxml.jackson.core.jackson-core">
 
    <description>
       %description
@@ -17,25 +18,25 @@
       %license
    </license>
 
-   <plugin
+    <plugin
          id="com.fasterxml.jackson.core.jackson-annotations"
          download-size="0"
          install-size="0"
-         version="2.6.2.v20161117-2150"
+         version="2.9.8"
          unpack="false"/>
 
    <plugin
          id="com.fasterxml.jackson.core.jackson-core"
          download-size="0"
          install-size="0"
-         version="2.6.2.v20161117-2150"
+         version="2.9.8"
          unpack="false"/>
 
    <plugin
          id="com.fasterxml.jackson.core.jackson-databind"
          download-size="0"
          install-size="0"
-         version="2.6.2.v20161117-2150"
+         version="2.9.8"
          unpack="false"/>
-
+		 
 </feature>
diff --git a/org.eclipse.osbp.dependencies.feature.jackson.core/pom.xml b/org.eclipse.osbp.dependencies.feature.jackson.core/pom.xml
index 9077555..d717f41 100644
--- a/org.eclipse.osbp.dependencies.feature.jackson.core/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.jackson.core/pom.xml
@@ -30,20 +30,53 @@
 	</properties>
 
     <repositories>
-    	<!-- Orbit should do the trick: http://download.eclipse.org/tools/orbit/downloads/drops2/R20170307180635 -->
+
     </repositories>
 
 	<dependencies>
 	
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18063 -->
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19219 -->
 		<!-- artifactId="com.fasterxml.jackson.core.jackson-annotations" -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.9.8</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.9.8</version>
+			<classifier>sources</classifier>
+		</dependency>
 
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18064 -->
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19220 -->
         <!-- artifactId="com.fasterxml.jackson.core.jackson-core" -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.8</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.8</version>
+			<classifier>sources</classifier>
+		</dependency>
 
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18065 -->
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19221 -->
         <!-- artifactId="com.fasterxml.jackson.core.jackson-databind" -->
-		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.8</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.8</version>
+			<classifier>sources</classifier>
+		</dependency>
+
 	</dependencies>
 	
     <build>
@@ -64,6 +97,9 @@
                 <configuration>
                     <labelSuffix> (source)</labelSuffix> 
                     <excludes>
+						<plugin id="com.fasterxml.jackson.core.jackson-annotations" />
+						<plugin id="com.fasterxml.jackson.core.jackson-core" />
+						<plugin id="com.fasterxml.jackson.core.jackson-databind" />
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml
index 76e2cc5..0c5d34a 100644
--- a/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.javax.annotation/feature.xml
@@ -16,7 +16,8 @@
       id="org.eclipse.osbp.dependencies.feature.javax.annotation"
       label="%featureName"
       version="1.2.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="javax.annotation">
 
    <description>
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.misc.external/feature.xml b/org.eclipse.osbp.dependencies.feature.misc.external/feature.xml
index c205926..17fa198 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.external/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.external/feature.xml
@@ -16,7 +16,9 @@
         id="org.eclipse.osbp.dependencies.feature.misc.external"
         label="%featureName"
         version="0.9.0.qualifier"
-        provider-name="%providerName">
+        provider-name="%providerName"
+	    plugin="org.eclipse.osbp.license">
+
         
     <description>
         %description
@@ -117,20 +119,6 @@
         unpack="false"/>
         
     <plugin
-        id="org.apache.httpcomponents.httpclient"
-        download-size="0"
-        install-size="0"
-        version="4.3.6.v201511171540"
-        unpack="false"/>
-        
-    <plugin
-        id="org.apache.httpcomponents.httpcore"
-        download-size="0"
-        install-size="0"
-        version="4.3.3.v201411290715"
-        unpack="false"/>
-        
-    <plugin
         id="org.apache.log4j"
         download-size="0"
         install-size="0"
@@ -148,7 +136,7 @@
         id="javassist"
         download-size="0"
         install-size="0"
-        version="3.13.0.GA_v201209210905"
+        version="3.22.0.GA"
         unpack="false"/>
 
         
@@ -254,7 +242,7 @@
         id="javax.validation.api"
         download-size="0"
         install-size="0"
-        version="0.0.0"
+        version="2.0.1.Final"
         unpack="false"/>
         
     <plugin
diff --git a/org.eclipse.osbp.dependencies.feature.misc.external/pom.xml b/org.eclipse.osbp.dependencies.feature.misc.external/pom.xml
index 70d6d2f..db9fcca 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.external/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.external/pom.xml
@@ -58,6 +58,10 @@
 			<url>http://download.eclipse.org/technology/m2e/releases/</url>
 			<layout>p2</layout>
 		</repository>
+		<repository>
+			<id>sonatype-releases</id>
+			<url>https://oss.sonatype.org/content/repositories/releases</url>
+		</repository>
 	</repositories>
 
 	<dependencies>
@@ -114,10 +118,12 @@
         <!-- artifact: org.apache.ant -->
 		<!-- version: 1.9.6.v201510161327 --> 
 
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12699 -->
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15308 -->
         <!-- artifact: org.apache.httpcomponents.httpclient -->
 		<!-- version: 4.3.6.v201511171540 --> 
 
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12698 -->
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15307 -->
         <!-- artifact: org.apache.httpcomponents.httpcore -->
 		<!-- version: 4.3.3.v201411290715 --> 
@@ -133,10 +139,20 @@
 			<version>3.0.8_1</version>
 		</dependency>
 		
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12592 -->
-        <!-- artifact: javassist -->
-		<!-- version: 3.13.0.GA_v201209210905 --> 
-
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19258 -->
+		<!-- https://mvnrepository.com/artifact/org.javassist/javassist -->
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.22.0-GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.22.0-GA</version>
+			<classifier>sources</classifier>
+		</dependency>
+		
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15346 -->
         <!-- artifact: org.apache.xalan -->
 		<!-- version: 2.7.1.v201005080400 --> 
@@ -202,11 +218,12 @@
         <!-- artifact: javax.servlet -->
 		<!-- version: 3.1.0.v201410161800 --> 
 
-		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15158 -->
+		<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+        <!-- CQ:  https://dev.eclipse.org/ipzilla/show_bug.cgi?id=19218 -->
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>1.1.0.Final</version>
+			<version>2.0.1.Final</version>
 		</dependency>
 
 		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12734 -->
@@ -303,6 +320,7 @@
 						<plugin id="org.mvel2" />
 						<plugin id="org.codehaus.jettison.jettison" />
 						<plugin id="com.sun.mail.javax.mail" />
+						<plugin id="javassist" />
 						<plugin id="javax.validation.api" />
 						<plugin id="javax.wsdl" />
 						<plugin id="javax.xml" />
diff --git a/org.eclipse.osbp.dependencies.feature.misc.mbp/feature.xml b/org.eclipse.osbp.dependencies.feature.misc.mbp/feature.xml
index eaa7993..0bec3f3 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.mbp/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.mbp/feature.xml
@@ -3,7 +3,9 @@
       id="org.eclipse.osbp.dependencies.feature.misc.mbp"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+  	  plugin="org.eclipse.osbp.license.full">
+
 
    <description>
       %description
@@ -25,6 +27,27 @@
          unpack="false"/>
 
    <plugin
+         id="org.apache.felix.gogo.command"
+         download-size="0"
+         install-size="0"
+         version="0.10.0.v201209301215"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.gogo.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.10.0.v201209301036"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.felix.gogo.shell"
+         download-size="0"
+         install-size="0"
+         version="0.10.0.v201212101605"
+         unpack="false"/>
+
+   <plugin
          id="org.apache.felix.utils.osgi"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.osbp.dependencies.feature.misc.mbp/pom.xml b/org.eclipse.osbp.dependencies.feature.misc.mbp/pom.xml
index 23598d4..ea4c4ad 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.mbp/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.mbp/pom.xml
@@ -31,6 +31,19 @@
             <artifactId>org.eclipse.osbp.dependencies.bundle.apache.bsf-api.osgi</artifactId>
             <version>3.1.0-SNAPSHOT</version>
         </dependency>
+		
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12692 -->
+        <!-- artifact: org.apache.felix.gogo.command -->
+		<!-- version: 0.10.0.v201209301215 --> 
+		
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12692 -->
+        <!-- artifact: org.apache.felix.gogo.runtime -->
+		<!-- version: 0.10.0.v201209301036 --> 
+		
+		<!-- CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12692 -->
+        <!-- artifact: org.apache.felix.gogo.shell -->
+		<!-- version: 0.10.0.v201212101605 --> 
+		
         <dependency>
             <groupId>org.eclipse.osbp.dependencies</groupId>
             <artifactId>org.eclipse.osbp.dependencies.bundle.felix.utils.osgi</artifactId>
diff --git a/org.eclipse.osbp.dependencies.feature.misc.runtime/feature.xml b/org.eclipse.osbp.dependencies.feature.misc.runtime/feature.xml
index ca73a34..a6b13b0 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.runtime/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.runtime/feature.xml
@@ -16,7 +16,9 @@
         id="org.eclipse.osbp.dependencies.feature.misc.runtime"
         label="%featureName"
         version="0.9.0.qualifier"
-        provider-name="%providerName">
+        provider-name="%providerName"
+ 	    plugin="org.eclipse.osbp.license.full">
+
         
     <description>
         %description
diff --git a/org.eclipse.osbp.dependencies.feature.misc.ui/feature.xml b/org.eclipse.osbp.dependencies.feature.misc.ui/feature.xml
index 09ce196..0148d2b 100644
--- a/org.eclipse.osbp.dependencies.feature.misc.ui/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.misc.ui/feature.xml
@@ -16,7 +16,9 @@
       id="org.eclipse.osbp.dependencies.feature.misc.ui"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+  	  plugin="org.eclipse.osbp.license.full">
+
 
    <description>
       %description
@@ -61,6 +63,27 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.graphiti"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.graphiti.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.graphiti.mm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="com.google.guava"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.osbp.dependencies.feature.postgresql/feature.xml b/org.eclipse.osbp.dependencies.feature.postgresql/feature.xml
index bcde2f1..885e02f 100644
--- a/org.eclipse.osbp.dependencies.feature.postgresql/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.postgresql/feature.xml
@@ -5,7 +5,7 @@
       label="%featureName"
       version="42.2.2.qualifier"
       provider-name="%providerName"
-     >
+	  plugin="org.postgresql.jdbc42">
 
    <description url="https://www.postgresql.org/">
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.quartz/feature.xml b/org.eclipse.osbp.dependencies.feature.quartz/feature.xml
index fa7f624..e44ad3e 100644
--- a/org.eclipse.osbp.dependencies.feature.quartz/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.quartz/feature.xml
@@ -16,7 +16,8 @@
       id="org.eclipse.osbp.dependencies.feature.quartz"
       label="%featureName"
       version="2.2.1.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="org.eclipse.osbp.license">
 
    <description>
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.sirius/feature.xml b/org.eclipse.osbp.dependencies.feature.sirius/feature.xml
index 39b8f0a..0df604b 100644
--- a/org.eclipse.osbp.dependencies.feature.sirius/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.sirius/feature.xml
@@ -20,74 +20,38 @@
    </license>
 
    <includes
-         id="org.eclipse.sirius.runtime.acceleo.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime.acceleo"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.runtime.ide.eef.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime.ide.eef"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.runtime.ide.ui.acceleo.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime.ide.ui.acceleo"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.runtime.ide.ui.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime.ide.ui"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.runtime.ocl.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime.ocl"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.runtime.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.runtime"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.specifier.ide.ui.acceleo.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.specifier.ide.ui.acceleo"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.specifier.ide.ui.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.specifier.ide.ui"
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.sirius.tests.support.source"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.sirius.tests.support"
          version="0.0.0"/>
 
diff --git a/org.eclipse.osbp.dependencies.feature.sirius/pom.xml b/org.eclipse.osbp.dependencies.feature.sirius/pom.xml
index 28d122e..c6a2f60 100644
--- a/org.eclipse.osbp.dependencies.feature.sirius/pom.xml
+++ b/org.eclipse.osbp.dependencies.feature.sirius/pom.xml
@@ -60,20 +60,9 @@
                     <excludes>
                         <plugin id="org.eclipse.swtbot.eclipse.gef.finder"/>
                         <feature id="org.eclipse.swtbot.eclipse"/>
-                        <feature id="org.eclipse.sirius.doc.feature.source"/>
-                        <feature id="org.eclipse.sirius.runtime.acceleo.source"/>
                         <feature id="org.eclipse.sirius.runtime.ide.eef"/>
-                        <feature id="org.eclipse.sirius.runtime.ide.eef.source"/>
-                        <feature id="org.eclipse.sirius.runtime.ide.ui.acceleo.source"/>
                         <feature id="org.eclipse.sirius.runtime.ide.ui"/>
-                        <feature id="org.eclipse.sirius.runtime.ide.ui.source"/>
-                        <feature id="org.eclipse.sirius.runtime.ocl.source"/>
                         <feature id="org.eclipse.sirius.runtime"/>
-                        <feature id="org.eclipse.sirius.runtime.source"/>
-                        <feature id="org.eclipse.sirius.samples.source"/>
-                        <feature id="org.eclipse.sirius.specifier.ide.ui.acceleo.source"/>
-                        <feature id="org.eclipse.sirius.specifier.ide.ui.source"/>
-                        <feature id="org.eclipse.sirius.tests.support.source"/>
                         <plugin id="org.eclipse.sirius.common.acceleo.aql"/>
                     </excludes>
                 </configuration>
diff --git a/org.eclipse.osbp.dependencies.feature.vaadin.addons/.gitignore b/org.eclipse.osbp.dependencies.feature.vaadin.addons/.gitignore
index 10529f3..f7f9c51 100644
--- a/org.eclipse.osbp.dependencies.feature.vaadin.addons/.gitignore
+++ b/org.eclipse.osbp.dependencies.feature.vaadin.addons/.gitignore
@@ -1,3 +1,2 @@
 /target/
-!**/README.txt
 /apidocs/
diff --git a/org.eclipse.osbp.dependencies.feature.vaadin.addons/feature.xml b/org.eclipse.osbp.dependencies.feature.vaadin.addons/feature.xml
index 7b1d92c..d1d52ff 100644
--- a/org.eclipse.osbp.dependencies.feature.vaadin.addons/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.vaadin.addons/feature.xml
@@ -4,7 +4,8 @@
       id="org.eclipse.osbp.dependencies.feature.vaadin.addons"
       label="%featureName"
       version="0.9.0.qualifier"
-      provider-name="%providerName">
+      provider-name="%providerName"
+	  plugin="org.eclipse.osbp.license.full">>
 
    <description>
       %description
diff --git a/org.eclipse.osbp.dependencies.feature.xtext.runtime/feature.xml b/org.eclipse.osbp.dependencies.feature.xtext.runtime/feature.xml
index 52227d2..beb36ad 100644
--- a/org.eclipse.osbp.dependencies.feature.xtext.runtime/feature.xml
+++ b/org.eclipse.osbp.dependencies.feature.xtext.runtime/feature.xml
@@ -5,7 +5,7 @@
       label="%featureName"
       version="2.11.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.xtext">
+      plugin="org.eclipse.osbp.license">
 
    <description>
       %description
diff --git a/pom.xml b/pom.xml
index 2af963a..677665c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
 		<module>org.eclipse.osbp.dependencies.feature.e4tools.runtime</module>
 		<module>org.eclipse.osbp.dependencies.feature.eclipse.core</module>
 		<module>org.eclipse.osbp.dependencies.feature.eclipse.core.databinding</module>
+		<module>org.eclipse.osbp.dependencies.feature.eclipse.ecf</module>
 		<module>org.eclipse.osbp.dependencies.feature.eclipse.emf</module>
 		<module>org.eclipse.osbp.dependencies.feature.eclipse.jdt</module>
 		<module>org.eclipse.osbp.dependencies.feature.eclipse.persistence</module>