diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index fd0239bba7..6358b1e9f6 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -20,7 +20,7 @@
-
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index c6710e9087..7941eaea0e 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -24,7 +24,7 @@
-
+
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 37961e37f8..587afb84e4 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -16,9 +16,9 @@ url.maven.zkoss=http://mavensync.zkoss.org
url.maven.zkoss.lib=http://mavensync.zkoss.org
url.zkoss.osgi=${local.repository.root}/jarfile/zk-p2/zk-8.0.2.2/
-url.equinox=http://download.eclipse.org/eclipse/updates/4.6
+url.equinox=http://download.eclipse.org/eclipse/updates/4.7
url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
-url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository
+url.orbit=http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository
url.file.srv=${local.repository.root}
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 6955074ce3..88883053ff 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini
index 2bc8b8cbc5..f63d88f720 100644
--- a/org.adempiere.server-feature/setup.ini
+++ b/org.adempiere.server-feature/setup.ini
@@ -1,5 +1,5 @@
-startup
-plugins/org.eclipse.equinox.launcher_1.3.201.v20161025-1711.jar
+plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar
-install
setup
--launcher.XXMaxPermSize
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 2ca860ed57..deeea9dcfb 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.11.3.v20170209-1843.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.12.0.v20170512-1932.jar
osgi.install.area=setup
osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.eclipse.equinox.util,\
@@ -22,6 +22,8 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.eclipse.equinox.app,\
org.eclipse.equinox.registry,\
org.eclipse.equinox.common@2:start,\
+ org.eclipse.equinox.util,\
+ org.apache.felix.scr,\
org.eclipse.core.contenttype,\
org.apache.poi,\
org.eclipse.core.jobs,\
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index d02a23f82e..75f43aa6a9 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -89,6 +89,34 @@
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
+
+