diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 21b5cda6f1..6b19c547d1 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -32,7 +32,10 @@
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -45,6 +48,7 @@
         <setEntry value="org.apache.activemq.activemq-core@default:default"/>
         <setEntry value="org.apache.activemq.kahadb@default:default"/>
         <setEntry value="org.apache.ant@default:default"/>
+        <setEntry value="org.apache.commons.codec@default:default"/>
         <setEntry value="org.apache.commons.collections@default:default"/>
         <setEntry value="org.apache.commons.commons-collections4@default:default"/>
         <setEntry value="org.apache.commons.compress@default:default"/>
@@ -54,6 +58,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -78,10 +84,15 @@
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base@default:default"/>
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index b90d89df97..6cbe72de5b 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -34,7 +34,10 @@
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -66,6 +69,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -96,10 +101,15 @@
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base.callout@default:default"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 9d1e5d861e..9a99040855 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -33,7 +33,10 @@
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -65,6 +68,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -93,10 +98,15 @@
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base.callout@default:default"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 093ff8bbc8..f8ddef4074 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -33,7 +33,10 @@
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -65,6 +68,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -94,10 +99,15 @@
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base.callout@default:default"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index 108a06e012..0866b697fd 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -33,7 +33,10 @@
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -65,6 +68,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -93,10 +98,15 @@
         <setEntry value="org.eclipse.osgi@-1:true"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base.callout@default:default"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index a456e52f48..d5f295b095 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -7,15 +7,7 @@ Bundle-ClassPath: .,
  lib/bsh.jar,
  lib/commons-validator.jar,
  lib/cron4j.jar,
- lib/avalon-framework-api.jar,
- lib/google-http-client.jar,
- lib/google-http-client-gson.jar,
- lib/google-oauth-client.jar,
- lib/grpc-context.jar,
- lib/httpclient.jar,
- lib/httpcore.jar,
- lib/opencensus-api.jar,
- lib/opencensus-contrib-http-util.jar
+ lib/avalon-framework-api.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
@@ -73,6 +65,26 @@ Import-Package: com.google.zxing,
  com.google.zxing.qrcode.decoder,
  com.google.zxing.qrcode.encoder,
  com.sun.mail.smtp;version="1.5",
+ io.grpc;version="1.35.0",
+ io.opencensus.common;version="0.28.3",
+ io.opencensus.contrib.http;version="0.28.3",
+ io.opencensus.contrib.http.util;version="0.28.3",
+ io.opencensus.internal;version="0.28.3",
+ io.opencensus.metrics;version="0.28.3",
+ io.opencensus.metrics.data;version="0.28.3",
+ io.opencensus.metrics.export;version="0.28.3",
+ io.opencensus.resource;version="0.28.3",
+ io.opencensus.stats;version="0.28.3",
+ io.opencensus.tags;version="0.28.3",
+ io.opencensus.tags.propagation;version="0.28.3",
+ io.opencensus.tags.unsafe;version="0.28.3",
+ io.opencensus.trace;version="0.28.3",
+ io.opencensus.trace.config;version="0.28.3",
+ io.opencensus.trace.export;version="0.28.3",
+ io.opencensus.trace.internal;version="0.28.3",
+ io.opencensus.trace.propagation;version="0.28.3",
+ io.opencensus.trace.samplers;version="0.28.3",
+ io.opencensus.trace.unsafe;version="0.28.3",
  javax.jms;version="1.1.0",
  javax.mail;version="1.5",
  javax.mail.internet;version="1.5",
@@ -132,7 +144,12 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
  org.apache.xmlbeans;bundle-version="3.1.0",
  org.jfree.chart;bundle-version="1.0.19",
  org.jfree.jcommon;bundle-version="1.0.23",
- com.google.guava;bundle-version="27.1.0",
- com.google.gson;bundle-version="2.8.2"
+ com.google.gson;bundle-version="2.8.2",
+ com.google.http-client.google-http-client;bundle-version="1.38.1",
+ com.google.oauth-client;bundle-version="1.31.4",
+ wrapped.com.google.http-client.google-http-client-gson;bundle-version="1.38.1",
+ org.apache.httpcomponents.httpclient;bundle-version="4.5.10",
+ org.apache.httpcomponents.httpcore;bundle-version="4.4.12",
+ com.google.guava;bundle-version="28.2.0"
 Automatic-Module-Name: org.adempiere.base
 Bundle-Vendor: iDempiere Community
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index c6e12c7572..7d3bd4bcce 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -21,15 +21,7 @@ bin.includes = plugin.xml,\
                lib/avalon-framework-api.jar,\
                lib/bsh.jar,\
                lib/commons-validator.jar,\
-               lib/cron4j.jar,\
-               lib/google-http-client.jar,\
-               lib/google-http-client-gson.jar,\
-               lib/google-oauth-client.jar,\
-               lib/grpc-context.jar,\
-               lib/httpclient.jar,\
-               lib/httpcore.jar,\
-               lib/opencensus-api.jar,\
-               lib/opencensus-contrib-http-util.jar
+               lib/cron4j.jar
 src.includes = schema/
 source.. = src/
 output.. = target/classes/
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index fe0fabfbc8..60ec7de37d 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -42,47 +42,7 @@
 									<groupId>org.apache.avalon.framework</groupId>
 									<artifactId>avalon-framework-api</artifactId>
 									<version>4.3.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>com.google.http-client</groupId>
-									<artifactId>google-http-client-gson</artifactId>
-									<version>1.38.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>com.google.http-client</groupId>
-									<artifactId>google-http-client</artifactId>
-									<version>1.38.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>com.google.oauth-client</groupId>
-									<artifactId>google-oauth-client</artifactId>
-									<version>1.31.4</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>io.grpc</groupId>
-									<artifactId>grpc-context</artifactId>
-									<version>1.35.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>io.opencensus</groupId>
-									<artifactId>opencensus-contrib-http-util</artifactId>
-									<version>0.28.3</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>io.opencensus</groupId>
-									<artifactId>opencensus-api</artifactId>
-									<version>0.28.3</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.httpcomponents</groupId>
-									<artifactId>httpclient</artifactId>
-									<version>4.5.13</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.httpcomponents</groupId>
-									<artifactId>httpcore</artifactId>
-									<version>4.4.14</version>
-								</artifactItem>
+								</artifactItem>							
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
 							<stripVersion>true</stripVersion>
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index e12ff6ea60..074ec7a417 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -30,7 +30,10 @@
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -58,6 +61,8 @@
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -85,11 +90,16 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base@default:default"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index a419966019..a9249196c9 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -30,7 +30,10 @@
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -56,6 +59,8 @@
         <setEntry value="org.apache.commons.net@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -82,11 +87,16 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base@default:default"/>
diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch
index d71d359804..28896eec9d 100644
--- a/org.adempiere.install/install.silent.app.launch
+++ b/org.adempiere.install/install.silent.app.launch
@@ -30,7 +30,10 @@
         <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
@@ -56,6 +59,8 @@
         <setEntry value="org.apache.commons.net@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml-schemas@default:default"/>
         <setEntry value="org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="org.apache.poi.poi@default:default"/>
@@ -82,11 +87,16 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.krysalis.barcode4j@default:default"/>
         <setEntry value="org.passay@default:default"/>
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="org.adempiere.base@default:default"/>
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 18525a24a2..72a1869276 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -496,4 +496,60 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.google.guava.failureaccess"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.http-client.google-http-client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.oauth-client"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jsr-305"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="wrapped.com.google.http-client.google-http-client-gson"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="wrapped.io.grpc.grpc-context"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="wrapped.io.opencensus.opencensus-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="wrapped.io.opencensus.opencensus-contrib-http-util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index b25a420fdf..8e51223884 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -95,7 +95,10 @@
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
@@ -135,11 +138,11 @@
         <setEntry value="javax.interceptor-api@default:default"/>
         <setEntry value="javax.jms@default:default"/>
         <setEntry value="javax.transaction-api@default:default"/>
-        <setEntry value="javax.validation.api*1.1.0.Final@default:default"/>
-        <setEntry value="javax.validation.api*2.0.1.Final@default:default"/>
+        <setEntry value="javax.validation.api@default:default"/>
         <setEntry value="javax.websocket-api@default:default"/>
         <setEntry value="joda-time@default:default"/>
-        <setEntry value="json@default:default"/>
+        <setEntry value="json*20180813.0.0@default:default"/>
+        <setEntry value="json*20190722.0.0@default:default"/>
         <setEntry value="net.sf.jasperreports.engine@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.runtime@default:default"/>
@@ -342,6 +345,7 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.jvnet.mimepull@default:default"/>
         <setEntry value="org.jvnet.staxex.stax-ex@default:default"/>
@@ -365,6 +369,10 @@
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
         <setEntry value="stax2-api@default:default"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="zcommon@default:default"/>
         <setEntry value="zel@default:default"/>
         <setEntry value="zhtml@default:default"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index e1cc414fb7..22fe12cf1c 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -95,7 +95,10 @@
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
@@ -135,11 +138,11 @@
         <setEntry value="javax.interceptor-api@default:default"/>
         <setEntry value="javax.jms@default:default"/>
         <setEntry value="javax.transaction-api@default:default"/>
-        <setEntry value="javax.validation.api*1.1.0.Final@default:default"/>
-        <setEntry value="javax.validation.api*2.0.1.Final@default:default"/>
+        <setEntry value="javax.validation.api@default:default"/>
         <setEntry value="javax.websocket-api@default:default"/>
         <setEntry value="joda-time@default:default"/>
-        <setEntry value="json@default:default"/>
+        <setEntry value="json*20180813.0.0@default:default"/>
+        <setEntry value="json*20190722.0.0@default:default"/>
         <setEntry value="net.sf.jasperreports.engine@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.runtime@default:default"/>
@@ -343,6 +346,7 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit@default:default"/>
         <setEntry value="org.jvnet.mimepull@default:default"/>
         <setEntry value="org.jvnet.staxex.stax-ex@default:default"/>
@@ -366,6 +370,10 @@
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
         <setEntry value="stax2-api@default:default"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="zcommon@default:default"/>
         <setEntry value="zel@default:default"/>
         <setEntry value="zhtml@default:default"/>
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 60eb6c9dc9..ee3c1bcbdc 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -65,7 +65,17 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
  groovy,\
  com.google.gson,\
  com.google.guava,\
+ com.google.guava.failureaccess,\
  com.google.zxing.core,\
+ com.google.http-client.google-http-client,\
+ com.google.oauth-client,\
+ org.jsr-305,\
+ wrapped.com.google.http-client.google-http-client-gson,\
+ wrapped.io.grpc.grpc-context,\
+ wrapped.io.opencensus.opencensus-api,\
+ wrapped.io.opencensus.opencensus-contrib-http-util,\
+ org.apache.httpcomponents.httpclient,\
+ org.apache.httpcomponents.httpcore,\
  org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\
  jakarta.xml.bind-api,\
  org.eclipse.osgi@start,\
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index e8bfae68e2..24030ebaf0 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -422,7 +422,7 @@
          id="javax.validation.api"
          download-size="0"
          install-size="0"
-         version="2.0.1.Final"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
new file mode 100644
index 0000000000..cb71f72c52
--- /dev/null
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -0,0 +1,165 @@
+<!-- location entries for maven artifacts. append to the end of the generated 
+	org.idempiere.p2.targetplatform.target target platform file -->
+<locations>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.http-client</groupId>
+		<artifactId>google-http-client-gson</artifactId>
+		<version>1.38.1</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.http-client</groupId>
+		<artifactId>google-http-client</artifactId>
+		<version>1.38.1</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.oauth-client</groupId>
+		<artifactId>google-oauth-client</artifactId>
+		<version>1.31.4</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>io.grpc</groupId>
+		<artifactId>grpc-context</artifactId>
+		<version>1.35.0</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>io.opencensus</groupId>
+		<artifactId>opencensus-contrib-http-util</artifactId>
+		<version>0.28.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>io.opencensus</groupId>
+		<artifactId>opencensus-api</artifactId>
+		<version>0.28.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.guava</groupId>
+		<artifactId>guava</artifactId>
+		<version>30.1.1-jre</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.guava</groupId>
+		<artifactId>failureaccess</artifactId>
+		<version>1.0.1</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.google.code.findbugs</groupId>
+		<artifactId>jsr305</artifactId>
+		<version>3.0.2</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.core</groupId>
+		<artifactId>jackson-annotations</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.core</groupId>
+		<artifactId>jackson-core</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.core</groupId>
+		<artifactId>jackson-databind</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.dataformat</groupId>
+		<artifactId>jackson-dataformat-xml</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.datatype</groupId>
+		<artifactId>jackson-datatype-guava</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.datatype</groupId>
+		<artifactId>jackson-datatype-joda</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.datatype</groupId>
+		<artifactId>jackson-datatype-json-org</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.jaxrs</groupId>
+		<artifactId>jackson-jaxrs-base</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.jaxrs</groupId>
+		<artifactId>jackson-jaxrs-json-provider</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.jaxrs</groupId>
+		<artifactId>jackson-jaxrs-xml-provider</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.module</groupId>
+		<artifactId>jackson-module-jaxb-annotations</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>com.fasterxml.jackson.module</groupId>
+		<artifactId>jackson-module-jsonSchema</artifactId>
+		<version>2.12.3</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>org.json</groupId>
+		<artifactId>json</artifactId>
+		<version>20190722</version>
+		<type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate"
+		type="Maven">
+		<groupId>javax.validation</groupId>
+		<artifactId>validation-api</artifactId>
+		<version>1.1.0.Final</version>
+		<type>jar</type>
+	</location>
+</locations>
\ No newline at end of file
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 73b696df6e..588e9b25a9 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-201101" sequenceNumber="1606184870">
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="idempiere-210426" sequenceNumber="1619428882">
   <locations>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="com.sun.istack.commons-runtime" version="3.0.8"/>
       <unit id="com.sun.org.apache.xml.internal.resolver" version="20050927.0.0"/>
       <unit id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.16"/>
@@ -23,7 +22,7 @@
       <unit id="org.jvnet.staxex.stax-ex" version="1.8.1"/>
       <repository location="https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="zcommon" version="9.5.0.1"/>
       <unit id="zel" version="9.5.0.1"/>
       <unit id="zhtml" version="9.5.0.1"/>
@@ -37,24 +36,12 @@
       <unit id="zweb-dsp" version="9.5.0.1"/>
       <repository location="https://idempiere.github.io/binary.file/p2.zk/9.5.0.1"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="bcmail" version="1.66.0"/>
       <unit id="bcpkix" version="1.66.0"/>
       <unit id="bcprov" version="1.66.0"/>
       <unit id="bctsp" version="1.46.0"/>
       <unit id="com.diffplug.osgi.extension.sun.misc" version="0.0.0"/>
-      <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.core.jackson-core" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.dataformat.jackson-dataformat-xml" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-joda" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.datatype.jackson-datatype-json-org" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="2.10.1"/>
-      <unit id="com.fasterxml.jackson.module.jackson-module-jsonSchema" version="2.10.1"/>
       <unit id="com.fasterxml.woodstox.woodstox-core" version="6.0.1"/>
       <unit id="com.github.relaxng.Datatype" version="2011.1.0"/>
       <unit id="com.google.zxing.core" version="3.4.0"/>
@@ -86,8 +73,6 @@
       <unit id="javax.enterprise.cdi-api" version="2.0.0.SP1"/>
       <unit id="javax.interceptor-api" version="1.2.2"/>
       <unit id="javax.transaction-api" version="1.3.0"/>
-      <unit id="javax.validation.api" version="1.1.0.Final"/>
-      <unit id="javax.validation.api" version="2.0.1.Final"/>
       <unit id="javax.websocket-api" version="1.1.0"/>
       <unit id="joda-time" version="2.10.8"/>
       <unit id="json" version="20180813.0.0"/>
@@ -217,7 +202,7 @@
       <unit id="stax2-api" version="4.2.0"/>
       <repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="3.16.0.v20200828-0759"/>
       <unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
       <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
@@ -304,9 +289,8 @@
       <unit id="org.eclipse.jdt.junit5.runtime" version="1.0.1000.v20200720-0748"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.17"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+    <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
       <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <unit id="javax.inject" version="1.0.0.v20091030"/>
       <unit id="javax.jms" version="1.1.0.v201205091237"/>
       <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
@@ -343,5 +327,143 @@
       <unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository"/>
     </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.http-client</groupId>
+		  <artifactId>google-http-client-gson</artifactId>
+		  <version>1.38.1</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.http-client</groupId>
+		  <artifactId>google-http-client</artifactId>
+		  <version>1.38.1</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.oauth-client</groupId>
+		  <artifactId>google-oauth-client</artifactId>
+		  <version>1.31.4</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>io.grpc</groupId>
+		  <artifactId>grpc-context</artifactId>
+		  <version>1.35.0</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>io.opencensus</groupId>
+		  <artifactId>opencensus-contrib-http-util</artifactId>
+		  <version>0.28.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>io.opencensus</groupId>
+		  <artifactId>opencensus-api</artifactId>
+		  <version>0.28.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.guava</groupId>
+		  <artifactId>guava</artifactId>
+		  <version>30.1.1-jre</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.guava</groupId>
+		  <artifactId>failureaccess</artifactId>
+		  <version>1.0.1</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.google.code.findbugs</groupId>
+		  <artifactId>jsr305</artifactId>
+		  <version>3.0.2</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.core</groupId>
+		  <artifactId>jackson-annotations</artifactId>
+		  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.core</groupId>
+		  <artifactId>jackson-core</artifactId>
+		  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.core</groupId>
+		  <artifactId>jackson-databind</artifactId>
+		  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.dataformat</groupId>
+    	  <artifactId>jackson-dataformat-xml</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.datatype</groupId>
+    	  <artifactId>jackson-datatype-guava</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.datatype</groupId>
+    	  <artifactId>jackson-datatype-joda</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.datatype</groupId>
+    	  <artifactId>jackson-datatype-json-org</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+    	  <artifactId>jackson-jaxrs-base</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+    	  <artifactId>jackson-jaxrs-json-provider</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.jaxrs</groupId>
+    	  <artifactId>jackson-jaxrs-xml-provider</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.module</groupId>
+    	  <artifactId>jackson-module-jaxb-annotations</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>com.fasterxml.jackson.module</groupId>
+    	  <artifactId>jackson-module-jsonSchema</artifactId>
+    	  <version>2.12.3</version>
+		  <type>jar</type>
+	  </location>
+	  <location includeSource="true" missingManifest="generate" type="Maven">
+	      <groupId>org.json</groupId>
+	      <artifactId>json</artifactId>
+	      <version>20190722</version>
+		  <type>jar</type>
+	  </location>
+ 	  <location includeSource="true" missingManifest="generate" type="Maven">
+		  <groupId>javax.validation</groupId>
+	      <artifactId>validation-api</artifactId>
+	      <version>1.1.0.Final</version>
+		  <type>jar</type>
+	  </location>
   </locations>
-</target>
+</target>
\ No newline at end of file
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index bb6351e203..617fd04acd 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -1,5 +1,5 @@
 
-target "idempiere-201101"
+target "idempiere-210426"
 
 with source configurePhase allEnvironments
 
@@ -43,18 +43,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" {
 	bcprov
 	bctsp
 	com.diffplug.osgi.extension.sun.misc
-	com.fasterxml.jackson.core.jackson-annotations
-	com.fasterxml.jackson.core.jackson-core
-	com.fasterxml.jackson.core.jackson-databind
-	com.fasterxml.jackson.dataformat.jackson-dataformat-xml
-	com.fasterxml.jackson.datatype.jackson-datatype-guava
-	com.fasterxml.jackson.datatype.jackson-datatype-joda
-	com.fasterxml.jackson.datatype.jackson-datatype-json-org
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-base
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider
-	com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider
-	com.fasterxml.jackson.module.jackson-module-jaxb-annotations
-	com.fasterxml.jackson.module.jackson-module-jsonSchema
 	com.fasterxml.woodstox.woodstox-core
 	com.github.relaxng.Datatype
 	com.google.zxing.core
@@ -86,7 +74,6 @@ location "https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20201101" {
 	javax.enterprise.cdi-api
 	javax.interceptor-api
 	javax.transaction-api
-	javax.validation.api [1.1.0.Final,1.1.0.Final]
 	javax.websocket-api
 	joda-time
 	json
@@ -315,7 +302,6 @@ location "https://download.eclipse.org/eclipse/updates/4.17" {
 
 location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository" {
 	com.google.gson
-	com.google.guava
 	javax.inject
 	javax.jms
 	org.antlr.runtime
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 7d11531e6a..9e8f055711 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -61,15 +61,15 @@
       <plugin id="org.idempiere.felix.webconsole" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-el" autoStart="true" startLevel="0" />
       <plugin id="org.mortbay.jasper.apache-jsp" autoStart="true" startLevel="0" />
-      <property name="osgi.checkConfiguration" value="true" />
       <property name="osgi.framework.activeThreadType" value="normal" />
-      <property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
-      <property name="osgi.noShutdown" value="true" />
       <property name="osgi.console.enable.builtin" value="false" />
       <property name="org.eclipse.update.reconcile" value="false" />
-      <property name="eclipse.product" value="org.adempiere.server.product" />
-      <property name="osgi.instance.area.default" value="@config.dir/../workspace" />
       <property name="osgi.compatibility.bootdelegation" value="true" />
+      <property name="osgi.checkConfiguration" value="true" />
+      <property name="osgi.instance.area.default" value="@config.dir/../workspace" />
+      <property name="org.eclipse.equinox.simpleconfigurator.exclusiveInstallation" value="false" />
+      <property name="osgi.noShutdown" value="true" />
+      <property name="eclipse.product" value="org.adempiere.server.product" />
    </configurations>
 
    <preferencesInfo>
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index d246a99ecb..a305b00e0f 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -58,7 +58,10 @@
         <setEntry value="com.fasterxml.woodstox.woodstox-core@default:default"/>
         <setEntry value="com.github.relaxng.Datatype@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.http-client.google-http-client@default:default"/>
+        <setEntry value="com.google.oauth-client@default:default"/>
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.itextpdf@default:default"/>
@@ -98,11 +101,11 @@
         <setEntry value="javax.interceptor-api@default:default"/>
         <setEntry value="javax.jms@default:default"/>
         <setEntry value="javax.transaction-api@default:default"/>
-        <setEntry value="javax.validation.api*1.1.0.Final@default:default"/>
-        <setEntry value="javax.validation.api*2.0.1.Final@default:default"/>
+        <setEntry value="javax.validation.api@default:default"/>
         <setEntry value="javax.websocket-api@default:default"/>
         <setEntry value="joda-time@default:default"/>
-        <setEntry value="json@default:default"/>
+        <setEntry value="json*20180813.0.0@default:default"/>
+        <setEntry value="json*20190722.0.0@default:default"/>
         <setEntry value="net.sf.jasperreports.engine@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.runtime@default:default"/>
@@ -307,6 +310,7 @@
         <setEntry value="org.hamcrest.core@default:default"/>
         <setEntry value="org.jfree.chart@default:default"/>
         <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsr-305@default:default"/>
         <setEntry value="org.junit.jupiter.api@default:default"/>
         <setEntry value="org.junit.jupiter.engine@default:default"/>
         <setEntry value="org.junit.jupiter.migrationsupport@default:default"/>
@@ -341,6 +345,10 @@
         <setEntry value="slf4j.api@default:default"/>
         <setEntry value="slf4j.jcl@default:false"/>
         <setEntry value="stax2-api@default:default"/>
+        <setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
+        <setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
+        <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="zjavassist@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">