diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index dfb4e4a8b4..109780d44b 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -20,6 +20,7 @@
+
@@ -82,7 +83,6 @@
-
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 2ba86d48ef..69873273fd 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -20,6 +20,7 @@
+
@@ -29,6 +30,7 @@
+
@@ -81,9 +83,11 @@
+
+
@@ -93,7 +97,7 @@
-
+
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 3723fa6add..05d0f62626 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -20,6 +20,7 @@
+
@@ -93,13 +94,12 @@
-
+
-
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index d4a034886c..d05a106b99 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -20,6 +20,7 @@
+
@@ -81,6 +82,7 @@
+
@@ -93,13 +95,12 @@
-
+
-
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index a86a26bc10..07f6f1f80b 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -20,6 +20,7 @@
+
@@ -93,13 +94,12 @@
-
+
-
diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch
index 69e4680bfc..cf3aa62e88 100644
--- a/org.adempiere.install/install.silent.app.launch
+++ b/org.adempiere.install/install.silent.app.launch
@@ -18,6 +18,7 @@
+
@@ -71,6 +72,7 @@
+
@@ -91,7 +93,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 1ae87c3c94..7d57ceb29f 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -47,6 +47,7 @@
+
@@ -109,7 +110,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index c9ff75a616..49468fc108 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -47,6 +47,7 @@
+
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 9111d5a63b..8f556283c7 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 8.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
- org.adempiere.install;bundle-version="0.0.0"
+ org.adempiere.install;bundle-version="0.0.0";resolution:=optional
Bundle-ClassPath: .,
lib/c3p0-oracle-thin-extras.jar,
lib/c3p0.jar,
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index 351ef90cdd..53e8257ef6 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-ClassPath: .,
lib/mchange-commons-java.jar,
lib/postgresql.jar
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
- org.adempiere.install;bundle-version="0.0.0"
+ org.adempiere.install;bundle-version="0.0.0";resolution:=optional
Import-Package: org.osgi.framework,
org.slf4j;version="1.7.2"
Bundle-ActivationPolicy: lazy