diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index e32d6e7c7f..7a8babe344 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
     <setAttribute key="additional_plugins">
-        <setEntry value="org.adempiere.eclipse.equinox.http.servlet:8.1.0.qualifier:default:true:default:true"/>
-        <setEntry value="org.adempiere.pipo:8.1.0.qualifier:default:true:default:true"/>
-        <setEntry value="org.adempiere.server:8.1.0.qualifier:default:true:default:true"/>
-        <setEntry value="org.adempiere.ui.zk:8.1.0.qualifier:default:true:default:true"/>
-        <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.2:default:true:1:true"/>
+        <setEntry value="org.adempiere.eclipse.equinox.http.servlet:9.0.0.qualifier:default:true:default:true"/>
+        <setEntry value="org.adempiere.pipo:9.0.0.qualifier:default:true:default:true"/>
+        <setEntry value="org.adempiere.server:9.0.0.qualifier:default:true:default:true"/>
+        <setEntry value="org.adempiere.ui.zk:9.0.0.qualifier:default:true:default:true"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.3:default:true:2:true"/>
         <setEntry value="org.apache.felix.webconsole:4.3.8:default:true:default:true"/>
         <setEntry value="org.eclipse.core.runtime:3.19.0.v20200724-1004:default:true:default:true"/>
         <setEntry value="org.eclipse.equinox.cm:1.4.400.v20200422-1833:default:true:default:true"/>
@@ -185,6 +185,9 @@
         <setEntry value="org.apache.geronimo.specs.geronimo-jms_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.httpcomponents.client5.httpclient5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
         <setEntry value="org.apache.neethi@default:default"/>
         <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
@@ -212,7 +215,7 @@
         <setEntry value="org.eclipse.core.variables@default:default"/>
         <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf.identity@default:default"/>
-        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5@default:default"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf@default:default"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index a6d7010632..5e1cf188eb 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -7,22 +7,22 @@
         <setEntry value="org.apache.aries.spifly.dynamic.bundle:1.3.3:default:true:2:true"/>
         <setEntry value="org.apache.felix.scr:2.1.24.v20200924-1939:default:true:2:true"/>
         <setEntry value="org.apache.felix.webconsole:4.6.4.v202109010034:default:true:default:true"/>
-        <setEntry value="org.eclipse.core.runtime:3.22.0.v20210506-1025:default:true:default:true"/>
-        <setEntry value="org.eclipse.equinox.cm:1.5.0.v20210202-1256:default:true:default:true"/>
-        <setEntry value="org.eclipse.equinox.common:3.15.0.v20210518-0604:default:true:2:true"/>
-        <setEntry value="org.eclipse.equinox.event:1.6.0.v20210212-1143:default:true:2:true"/>
-        <setEntry value="org.eclipse.equinox.http.registry:1.2.0.v20200614-1851:default:true:default:true"/>
+        <setEntry value="org.eclipse.core.runtime:3.24.100.v20220211-2001:default:true:default:true"/>
+        <setEntry value="org.eclipse.equinox.cm:1.5.100.v20211021-1418:default:true:default:true"/>
+        <setEntry value="org.eclipse.equinox.common:3.16.0.v20220211-2322:default:true:2:true"/>
+        <setEntry value="org.eclipse.equinox.event:1.6.100.v20211021-1418:default:true:2:true"/>
+        <setEntry value="org.eclipse.equinox.http.registry:1.3.100.v20211021-1418:default:true:default:true"/>
         <setEntry value="org.eclipse.equinox.simpleconfigurator:1.4.0.v20210315-2228:default:true:1:true"/>
-        <setEntry value="org.eclipse.jetty.annotations:10.0.7:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.apache-jsp:10.0.7:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.http:10.0.7:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.osgi.boot:10.0.7:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.7:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.common:10.0.7:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.core.server:10.0.7:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.7:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.7:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.server:10.0.7:default:true:3:true"/>
+        <setEntry value="org.eclipse.jetty.annotations:10.0.9:default:true:default:true"/>
+        <setEntry value="org.eclipse.jetty.apache-jsp:10.0.9:default:true:default:true"/>
+        <setEntry value="org.eclipse.jetty.http:10.0.9:default:true:default:true"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot:10.0.9:default:true:default:true"/>
+        <setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.9:default:true:default:true"/>
+        <setEntry value="org.eclipse.jetty.websocket.common:10.0.9:default:true:3:true"/>
+        <setEntry value="org.eclipse.jetty.websocket.core.server:10.0.9:default:true:3:true"/>
+        <setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.9:default:true:3:true"/>
+        <setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.9:default:true:3:true"/>
+        <setEntry value="org.eclipse.jetty.websocket.server:10.0.9:default:true:3:true"/>
         <setEntry value="org.idempiere.felix.webconsole:10.0.0.qualifier:default:true:default:true"/>
         <setEntry value="org.mortbay.jasper.apache-el:9.0.52:default:true:default:true"/>
         <setEntry value="org.mortbay.jasper.apache-jsp:9.0.52:default:true:default:true"/>
@@ -189,6 +189,9 @@
         <setEntry value="org.apache.geronimo.specs.geronimo-jms_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.httpcomponents.client5.httpclient5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
         <setEntry value="org.apache.neethi@default:default"/>
         <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.batik@default:default"/>
@@ -217,7 +220,7 @@
         <setEntry value="org.eclipse.core.variables@default:default"/>
         <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf.identity@default:default"/>
-        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5@default:default"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf@default:default"/>
diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini
index 58106b485c..025b194bbd 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.6.200.v20210416-2027.jar
+plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.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 0dc73f8ad8..1519cdeb3c 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.16.300.v20210525-1715.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.17.200.v20220215-2237.jar
 osgi.install.area=setup
 osgi.bundles=org.apache.felix.scr@1:start,\
  org.eclipse.core.variables,\
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index ba4c97bcb9..9ba470ccf4 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -89,12 +89,14 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  org.adempiere.webui.apps,
  org.adempiere.webui.apps.form,
  org.adempiere.webui.apps.graph,
+ org.adempiere.webui.apps.graph.jfreegraph,
  org.adempiere.webui.apps.graph.model,
  org.adempiere.webui.apps.wf,
  org.adempiere.webui.component,
  org.adempiere.webui.dashboard,
  org.adempiere.webui.desktop,
  org.adempiere.webui.editor,
+ org.adempiere.webui.editor.grid.selection,
  org.adempiere.webui.event,
  org.adempiere.webui.exception,
  org.adempiere.webui.factory,
@@ -105,17 +107,21 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  org.adempiere.webui.part,
  org.adempiere.webui.process,
  org.adempiere.webui.report,
+ org.adempiere.webui.scheduler,
  org.adempiere.webui.session,
  org.adempiere.webui.theme,
  org.adempiere.webui.util,
  org.adempiere.webui.window,
  org.idempiere.ui.zk.annotation,
  org.idempiere.ui.zk.media,
+ org.idempiere.ui.zk.websocket,
  org.zkforge.ckez,
  org.zkforge.keylistener,
+ org.zkoss.addon.chosenbox,
  web.chosenbox.img,
  web.ckez.html,
  web.ckez.img,
+ web.js.adempiere.local.storage,
  web.js.chosenbox,
  web.js.chosenbox.css,
  web.js.chosenbox.mold,
@@ -128,11 +134,18 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.ckez.ext.CKeditor.plugins.a11yhelp.dialogs.lang,
  web.js.ckez.ext.CKeditor.plugins.about.dialogs,
  web.js.ckez.ext.CKeditor.plugins.about.dialogs.hidpi,
+ web.js.ckez.ext.CKeditor.plugins.clipboard.dialogs,
  web.js.ckez.ext.CKeditor.plugins.colordialog.dialogs,
  web.js.ckez.ext.CKeditor.plugins.copyformatting.cursors,
  web.js.ckez.ext.CKeditor.plugins.copyformatting.styles,
  web.js.ckez.ext.CKeditor.plugins.dialog,
+ web.js.ckez.ext.CKeditor.plugins.dialog.styles,
  web.js.ckez.ext.CKeditor.plugins.div.dialogs,
+ web.js.ckez.ext.CKeditor.plugins.exportpdf,
+ web.js.ckez.ext.CKeditor.plugins.exportpdf.tests,
+ web.js.ckez.ext.CKeditor.plugins.exportpdf.tests._helpers,
+ web.js.ckez.ext.CKeditor.plugins.exportpdf.tests.manual,
+ web.js.ckez.ext.CKeditor.plugins.exportpdf.tests.manual.integrations,
  web.js.ckez.ext.CKeditor.plugins.find.dialogs,
  web.js.ckez.ext.CKeditor.plugins.forms.dialogs,
  web.js.ckez.ext.CKeditor.plugins.forms.images,
@@ -147,8 +160,13 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.ckez.ext.CKeditor.plugins.magicline.images,
  web.js.ckez.ext.CKeditor.plugins.magicline.images.hidpi,
  web.js.ckez.ext.CKeditor.plugins.pagebreak.images,
+ web.js.ckez.ext.CKeditor.plugins.pastefromgdocs.filter,
+ web.js.ckez.ext.CKeditor.plugins.pastefromlibreoffice.filter,
  web.js.ckez.ext.CKeditor.plugins.pastefromword.filter,
+ web.js.ckez.ext.CKeditor.plugins.pastetools.filter,
  web.js.ckez.ext.CKeditor.plugins.preview,
+ web.js.ckez.ext.CKeditor.plugins.preview.images,
+ web.js.ckez.ext.CKeditor.plugins.preview.styles,
  web.js.ckez.ext.CKeditor.plugins.scayt,
  web.js.ckez.ext.CKeditor.plugins.scayt.dialogs,
  web.js.ckez.ext.CKeditor.plugins.scayt.skins,
@@ -160,13 +178,19 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.ckez.ext.CKeditor.plugins.table.dialogs,
  web.js.ckez.ext.CKeditor.plugins.tableselection.styles,
  web.js.ckez.ext.CKeditor.plugins.tabletools.dialogs,
+ web.js.ckez.ext.CKeditor.plugins.templates,
  web.js.ckez.ext.CKeditor.plugins.templates.dialogs,
  web.js.ckez.ext.CKeditor.plugins.templates.templates,
  web.js.ckez.ext.CKeditor.plugins.templates.templates.images,
- web.js.ckez.ext.CKeditor.plugins.wsc,
- web.js.ckez.ext.CKeditor.plugins.wsc.dialogs,
- web.js.ckez.ext.CKeditor.plugins.wsc.skins,
+ web.js.ckez.ext.CKeditor.plugins.widget.images,
  web.js.ckez.ext.CKeditor.skins,
+ web.js.ckez.ext.CKeditor.vendor,
+ web.js.html2canvas,
+ web.js.jawwa.atmosphere,
+ web.js.jquery.maskedinput,
+ web.js.org.idempiere.commons,
+ web.js.org.idempiere.websocket,
+ web.js.photobooth,
  web.js.zkforge.keylistener,
  web.js.zkforge.keylistener.mold
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index d557438ec1..5af3c4e6b8 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -53,7 +53,7 @@
 								<artifactItem>
 									<groupId>org.zkoss.zkforge</groupId>
 									<artifactId>ckez</artifactId>
-									<version>4.17.1.0</version>
+									<version>4.18.0.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 2003acb51a..0c8de15e18 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -60,19 +60,26 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpclient"
+         id="org.apache.httpcomponents.client5.httpclient5"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.apache.httpcomponents.httpcore"
+         id="org.apache.httpcomponents.core5.httpcore5"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.httpcomponents.core5.httpcore5-h2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
    <plugin
          id="org.eclipse.core.jobs"
          download-size="0"
@@ -321,7 +328,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient45"
+         id="org.eclipse.ecf.provider.filetransfer.httpclient5"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
index 9defa02be9..769782156f 100644
--- a/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
+++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
@@ -1,4 +1,4 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.16.300.v20210525-1715.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.17.200.v20220215-2237.jar
 osgi.install.area=director
 equinox.use.ds=true
 osgi.bundles=org.eclipse.core.net@start,\
@@ -41,15 +41,16 @@ osgi.bundles=org.eclipse.core.net@start,\
  org.eclipse.ecf.identity,\
  org.eclipse.ecf.provider.filetransfer,\
  org.eclipse.ecf.provider.filetransfer.ssl,\
- org.eclipse.ecf.provider.filetransfer.httpclient45,\
+ org.eclipse.ecf.provider.filetransfer.httpclient5,\
  org.sat4j.core,\
  org.sat4j.pb,\
  org.apache.commons.collections,\
  org.apache.commons.commons-net,\
  org.apache.commons.commons-codec,\
  org.apache.commons.logging,\
- org.apache.httpcomponents.httpclient,\
- org.apache.httpcomponents.httpcore,\
+ org.apache.httpcomponents.client5.httpclient5,\
+ org.apache.httpcomponents.core5.httpcore5,\
+ org.apache.httpcomponents.core5.httpcore5-h2,\
  org.apache.ant,\
  org.hamcrest.core,\
  org.junit,\
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index 70ae96d341..df6a40fdb4 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -5,7 +5,7 @@
     <location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
+      <version>2.9.0</version>
 	  <type>jar</type>
 	</location>    
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1016,7 +1016,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1029,7 +1029,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1042,7 +1042,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1055,7 +1055,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1068,7 +1068,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1081,7 +1081,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1094,7 +1094,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1173,19 +1173,19 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jsp</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jstl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1197,109 +1197,109 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-plus</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaas</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-jsp</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-warurl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-warurl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-httpservice</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-jetty-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-javax-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-javax-common</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1352,7 +1352,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
 	  <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.8.138</version>
+      <version>4.8.147</version>
       <type>jar</type>
 	</location>
 	<!-- AssertJ -->
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
index 8387bd410c..d0abf9d52c 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.repository.target
@@ -43,8 +43,8 @@
 		<plugin id="com.sun.mail.jakarta.mail"/>
 		<plugin id="com.sun.xml.bind.external.relaxng-datatype"/>
 		<plugin id="com.sun.xml.bind.jaxb-impl"/>
-		<plugin id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.18.v202109010034"/>
 		<plugin id="com.sun.xml.fastinfoset.FastInfoset" version="2.0.0"/>
+		<plugin id="com.sun.xml.fastinfoset.FastInfoset" version="1.2.18.v202109010034"/>
 		<plugin id="com.sun.xml.messaging.saaj.impl"/>
 		<plugin id="com.sun.xml.stream.buffer.streambuffer"/>
 		<plugin id="com.sun.xml.ws.jaxws-rt"/>
@@ -151,7 +151,6 @@
 		<plugin id="org.eclipse.ecf.filetransfer"/>
 		<plugin id="org.eclipse.ecf.identity"/>
 		<plugin id="org.eclipse.ecf.provider.filetransfer"/>
-		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
 		<plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
 		<plugin id="org.eclipse.equinox.app"/>
 		<plugin id="org.eclipse.equinox.cm"/>
@@ -334,5 +333,9 @@
 		<plugin id="zul"/>
 		<plugin id="zweb"/>
 		<plugin id="zweb-dsp"/>
+		<plugin id="org.apache.httpcomponents.client5.httpclient5"/>
+		<plugin id="org.apache.httpcomponents.core5.httpcore5"/>
+		<plugin id="org.apache.httpcomponents.core5.httpcore5-h2"/>
+		<plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
 	</includeBundles>
 </target>
\ 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 ac3f9d354b..b1ed58ee9e 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-220428" sequenceNumber="1643026598">
+<target name="idempiere-220525" sequenceNumber="1653486593">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="zcommon" version="9.6.1"/>
-      <unit id="zel" version="9.6.1"/>
-      <unit id="zhtml" version="9.6.1"/>
-      <unit id="zjavassist" version="9.6.1"/>
-      <unit id="zk" version="9.6.1"/>
-      <unit id="zkbind" version="9.6.1"/>
-      <unit id="zkplus" version="9.6.1"/>
-      <unit id="zkwebfragment" version="9.6.1"/>
-      <unit id="zul" version="9.6.1"/>
-      <unit id="zweb" version="9.6.1"/>
-      <unit id="zweb-dsp" version="9.6.1"/>
-      <repository location="https://idempiere.github.io/binary.file/p2.zk/9.6.1"/>
+      <unit id="zcommon" version="9.6.2"/>
+      <unit id="zel" version="9.6.2"/>
+      <unit id="zhtml" version="9.6.2"/>
+      <unit id="zjavassist" version="9.6.2"/>
+      <unit id="zk" version="9.6.2"/>
+      <unit id="zkbind" version="9.6.2"/>
+      <unit id="zkplus" version="9.6.2"/>
+      <unit id="zkwebfragment" version="9.6.2"/>
+      <unit id="zul" version="9.6.2"/>
+      <unit id="zweb" version="9.6.2"/>
+      <unit id="zweb-dsp" version="9.6.2"/>
+      <repository location="https://idempiere.github.io/binary.file/p2.zk/9.6.2"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="jakarta.xml.ws-api" version="2.3.3.v202109010034"/>
@@ -28,72 +28,8 @@
       <repository location="https://idempiere.github.io/binary.file/p2.repackaged/9.0.0"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.osgi" version="3.16.300.v20210525-1715"/>
-      <unit id="org.apache.felix.gogo.command" version="1.1.2.v20210111-1007"/>
-      <unit id="org.apache.felix.gogo.runtime" version="1.1.4.v20210111-1007"/>
-      <unit id="org.apache.felix.gogo.shell" version="1.1.4.v20210111-1007"/>
-      <unit id="org.apache.felix.scr" version="2.1.24.v20200924-1939"/>
       <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
       <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
-      <unit id="org.eclipse.core.jobs" version="3.11.0.v20210420-1453"/>
-      <unit id="org.eclipse.ecf" version="3.9.102.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.filetransfer" version="5.1.102.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.identity" version="3.9.402.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.provider.filetransfer" version="3.2.601.v20201025-0700"/>
-      <unit id="org.eclipse.ecf.provider.filetransfer.httpclient45" version="1.0.401.v20210512-0614"/>
-      <unit id="org.eclipse.ecf.provider.filetransfer.ssl" version="1.0.201.v20210409-2301"/>
-      <unit id="org.eclipse.equinox.app" version="1.5.100.v20210212-1143"/>
-      <unit id="org.eclipse.equinox.common" version="3.15.0.v20210518-0604"/>
-      <unit id="org.eclipse.equinox.concurrent" version="1.2.0.v20210202-1157"/>
-      <unit id="org.eclipse.equinox.console" version="1.4.400.v20210602-1312"/>
-      <unit id="org.eclipse.equinox.frameworkadmin" version="2.2.0.v20210315-2042"/>
-      <unit id="org.eclipse.equinox.frameworkadmin.equinox" version="1.2.0.v20210315-2042"/>
-      <unit id="org.eclipse.equinox.launcher" version="1.6.200.v20210416-2027"/>
-      <unit id="org.eclipse.equinox.p2.artifact.repository" version="1.4.100.v20210418-1636"/>
-      <unit id="org.eclipse.equinox.p2.console" version="1.2.0.v20210315-2042"/>
-      <unit id="org.eclipse.equinox.p2.core" version="2.7.0.v20210315-2042"/>
-      <unit id="org.eclipse.equinox.p2.director" version="2.5.0.v20210325-0750"/>
-      <unit id="org.eclipse.equinox.p2.engine" version="2.7.0.v20210328-0514"/>
-      <unit id="org.eclipse.equinox.p2.garbagecollector" version="1.2.0.v20210316-1209"/>
-      <unit id="org.eclipse.equinox.p2.jarprocessor" version="1.2.0.v20210507-0825"/>
-      <unit id="org.eclipse.equinox.p2.metadata" version="2.6.0.v20210331-1610"/>
-      <unit id="org.eclipse.equinox.p2.metadata.repository" version="1.4.0.v20210315-2228"/>
-      <unit id="org.eclipse.equinox.p2.operations" version="2.6.0.v20210315-2228"/>
-      <unit id="org.eclipse.equinox.p2.repository" version="2.5.100.v20210329-1206"/>
-      <unit id="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.3.0.v20210315-2228"/>
-      <unit id="org.eclipse.equinox.p2.touchpoint.natives" version="1.4.0.v20210326-2048"/>
-      <unit id="org.eclipse.equinox.p2.transport.ecf" version="1.3.100.v20210329-1206"/>
-      <unit id="org.eclipse.equinox.preferences" version="3.8.200.v20210212-1143"/>
-      <unit id="org.eclipse.equinox.registry" version="3.10.200.v20210503-1606"/>
-      <unit id="org.eclipse.equinox.security" version="1.3.600.v20210126-1005"/>
-      <unit id="org.eclipse.equinox.simpleconfigurator" version="1.4.0.v20210315-2228"/>
-      <unit id="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.2.0.v20210315-2228"/>
-      <unit id="org.eclipse.osgi.services" version="3.10.100.v20210324-0936"/>
-      <unit id="org.eclipse.osgi.util" version="3.6.0.v20210212-1137"/>
-      <unit id="org.sat4j.core" version="2.3.5.v201308161310"/>
-      <unit id="org.sat4j.pb" version="2.3.5.v201404071733"/>
-      <unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1200.v20210527-0259"/>
-      <unit id="org.eclipse.equinox.http.registry" version="1.2.0.v20200614-1851"/>
-      <unit id="org.eclipse.osgi.compatibility.state" version="1.2.400.v20210401-1438"/>
-      <unit id="org.eclipse.core.runtime" version="3.22.0.v20210506-1025"/>
-      <unit id="org.eclipse.equinox.http.servlet" version="1.7.100.v20210311-1631"/>
-      <unit id="org.eclipse.equinox.servletbridge" version="1.6.0.v20200511-1902"/>
-      <unit id="org.eclipse.equinox.p2.director.app" version="1.2.0.v20210315-2042"/>
-      <unit id="org.eclipse.equinox.cm" version="1.5.0.v20210202-1256"/>
-      <unit id="org.eclipse.equinox.event" version="1.6.0.v20210212-1143"/>
-      <unit id="org.eclipse.equinox.http.servletbridge" version="1.2.0.v20210120-1213"/>
-      <unit id="org.eclipse.equinox.metatype" version="1.6.0.v20210212-1143"/>
-      <unit id="org.eclipse.ant.core" version="3.6.0.v20210415-1314"/>
-      <unit id="org.eclipse.core.commands" version="3.10.0.v20210401-0744"/>
-      <unit id="org.eclipse.core.contenttype" version="3.7.1000.v20210409-1722"/>
-      <unit id="org.eclipse.core.expressions" version="3.7.100.v20210203-1000"/>
-      <unit id="org.eclipse.core.filesystem" version="1.9.0.v20210419-1155"/>
-      <unit id="org.eclipse.core.net" version="1.3.1100.v20210424-0724"/>
-      <unit id="org.eclipse.core.resources" version="3.15.0.v20210521-0722"/>
-      <unit id="org.eclipse.core.variables" version="3.5.0.v20210510-1945"/>
-      <unit id="org.eclipse.jdt.core" version="3.26.0.v20210609-0549"/>
-      <unit id="org.eclipse.text" version="3.12.0.v20210512-1644"/>
       <repository location="https://download.eclipse.org/eclipse/updates/4.20"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
@@ -115,7 +51,74 @@
       <unit id="org.eclipse.pde.junit.runtime" version="3.6.100.v20211112-1151"/>
       <unit id="org.eclipse.jdt.junit.runtime" version="3.6.100.v20210708-1502"/>
       <unit id="org.eclipse.jdt.junit5.runtime" version="1.0.1400.v20211108-0640"/>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.22"/>
+      <unit id="org.eclipse.osgi" version="3.17.200.v20220215-2237"/>
+      <unit id="org.apache.felix.gogo.command" version="1.1.2.v20210111-1007"/>
+      <unit id="org.apache.felix.gogo.runtime" version="1.1.4.v20210111-1007"/>
+      <unit id="org.apache.felix.gogo.shell" version="1.1.4.v20210111-1007"/>
+      <unit id="org.apache.felix.scr" version="2.1.24.v20200924-1939"/>
+      <unit id="org.apache.httpcomponents.client5.httpclient5" version="5.1.2.v20211217-1500"/>
+      <unit id="org.apache.httpcomponents.core5.httpcore5" version="5.1.2.v20211217-1500"/>
+      <unit id="org.apache.httpcomponents.core5.httpcore5-h2" version="5.1.2.v20211217-1500"/>
+      <unit id="org.eclipse.core.jobs" version="3.12.100.v20220120-1329"/>
+      <unit id="org.eclipse.ecf" version="3.10.0.v20210925-0032"/>
+      <unit id="org.eclipse.ecf.filetransfer" version="5.1.102.v20210409-2301"/>
+      <unit id="org.eclipse.ecf.identity" version="3.9.402.v20210409-2301"/>
+      <unit id="org.eclipse.ecf.provider.filetransfer" version="3.2.800.v20220215-0126"/>
+      <unit id="org.eclipse.ecf.provider.filetransfer.httpclient5" version="1.0.300.v20220215-0126"/>
+      <unit id="org.eclipse.ecf.provider.filetransfer.ssl" version="1.0.201.v20210409-2301"/>
+      <unit id="org.eclipse.equinox.app" version="1.6.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.common" version="3.16.0.v20220211-2322"/>
+      <unit id="org.eclipse.equinox.concurrent" version="1.2.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.console" version="1.4.500.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.frameworkadmin" version="2.2.0.v20210315-2042"/>
+      <unit id="org.eclipse.equinox.frameworkadmin.equinox" version="1.2.100.v20210703-1540"/>
+      <unit id="org.eclipse.equinox.launcher" version="1.6.400.v20210924-0641"/>
+      <unit id="org.eclipse.equinox.p2.artifact.repository" version="1.4.400.v20220223-1131"/>
+      <unit id="org.eclipse.equinox.p2.console" version="1.2.0.v20210315-2042"/>
+      <unit id="org.eclipse.equinox.p2.core" version="2.9.0.v20220210-1157"/>
+      <unit id="org.eclipse.equinox.p2.director" version="2.5.200.v20220127-1112"/>
+      <unit id="org.eclipse.equinox.p2.engine" version="2.7.300.v20220209-1714"/>
+      <unit id="org.eclipse.equinox.p2.garbagecollector" version="1.2.0.v20210316-1209"/>
+      <unit id="org.eclipse.equinox.p2.jarprocessor" version="1.2.200.v20220207-0719"/>
+      <unit id="org.eclipse.equinox.p2.metadata" version="2.6.100.v20210813-0606"/>
+      <unit id="org.eclipse.equinox.p2.metadata.repository" version="1.4.0.v20210315-2228"/>
+      <unit id="org.eclipse.equinox.p2.operations" version="2.6.0.v20210315-2228"/>
+      <unit id="org.eclipse.equinox.p2.repository" version="2.6.0.v20220215-0840"/>
+      <unit id="org.eclipse.equinox.p2.touchpoint.eclipse" version="2.3.100.v20210615-1334"/>
+      <unit id="org.eclipse.equinox.p2.touchpoint.natives" version="1.4.300.v20220210-1319"/>
+      <unit id="org.eclipse.equinox.p2.transport.ecf" version="1.3.200.v20210613-1953"/>
+      <unit id="org.eclipse.equinox.preferences" version="3.9.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.registry" version="3.11.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.security" version="1.3.900.v20220108-1321"/>
+      <unit id="org.eclipse.equinox.simpleconfigurator" version="1.4.0.v20210315-2228"/>
+      <unit id="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.2.0.v20210315-2228"/>
+      <unit id="org.eclipse.osgi.services" version="3.10.200.v20210723-0643"/>
+      <unit id="org.eclipse.osgi.util" version="3.6.100.v20210723-1119"/>
+      <unit id="org.sat4j.core" version="2.3.5.v201308161310"/>
+      <unit id="org.sat4j.pb" version="2.3.5.v201404071733"/>
+      <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1500.v20220210-1108"/>
+      <unit id="org.eclipse.equinox.http.registry" version="1.3.100.v20211021-1418"/>
+      <unit id="org.eclipse.osgi.compatibility.state" version="1.2.600.v20220207-1403"/>
+      <unit id="org.eclipse.core.runtime" version="3.24.100.v20220211-2001"/>
+      <unit id="org.eclipse.equinox.http.servlet" version="1.7.200.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.servletbridge" version="1.6.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.p2.director.app" version="1.2.100.v20211220-1825"/>
+      <unit id="org.eclipse.equinox.cm" version="1.5.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.event" version="1.6.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.http.servletbridge" version="1.2.100.v20211021-1418"/>
+      <unit id="org.eclipse.equinox.metatype" version="1.6.100.v20211021-1418"/>
+      <unit id="org.eclipse.ant.core" version="3.6.300.v20220214-2001"/>
+      <unit id="org.eclipse.core.commands" version="3.10.100.v20210722-1426"/>
+      <unit id="org.eclipse.core.contenttype" version="3.8.100.v20210910-0640"/>
+      <unit id="org.eclipse.core.expressions" version="3.8.100.v20210910-0640"/>
+      <unit id="org.eclipse.core.filesystem" version="1.9.300.v20220121-1426"/>
+      <unit id="org.eclipse.core.net" version="1.3.1100.v20210424-0724"/>
+      <unit id="org.eclipse.core.resources" version="3.16.100.v20220214-1012"/>
+      <unit id="org.eclipse.core.variables" version="3.5.100.v20210721-1355"/>
+      <unit id="org.eclipse.jdt.core" version="3.29.0.v20220214-1307"/>
+      <unit id="org.eclipse.text" version="3.12.0.v20210512-1644"/>
+      <repository id="eclipse-2022-03" location="https://download.eclipse.org/eclipse/updates/4.23"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.apache.ant" version="1.10.10.v20210426-1926"/>
@@ -129,7 +132,7 @@
       <unit id="org.apache.xalan" version="2.7.2.v20201124-1837"/>
       <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
       <unit id="org.apache.commons.discovery" version="0.2.0.v201004190315"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
+      <repository id="orbit-2021-06-R20210602031627" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
@@ -142,7 +145,7 @@
     <location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
+      <version>2.9.0</version>
 	  <type>jar</type>
 	</location>    
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1153,7 +1156,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1166,7 +1169,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1179,7 +1182,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1192,7 +1195,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1205,7 +1208,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1218,7 +1221,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1231,7 +1234,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>5.2.15.RELEASE</version>
+      <version>5.2.22.RELEASE</version>
       <type>jar</type>
       <instructions><![CDATA[Bundle-Name:           Bundle derived from maven artifact ${mvnGroupId}:${mvnArtifactId}:${mvnVersion}
 version:               ${version_cleanup;${mvnVersion}}
@@ -1310,19 +1313,19 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jsp</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jstl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1334,109 +1337,109 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-plus</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaas</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-jsp</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-warurl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-osgi-boot-warurl</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.osgi</groupId>
       <artifactId>jetty-httpservice</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-jetty-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-javax-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-javax-common</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-core-server</artifactId>
-      <version>10.0.7</version>
+      <version>10.0.9</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
@@ -1489,7 +1492,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 	<location includeSource="true" missingManifest="generate" type="Maven">
 	  <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.8.138</version>
+      <version>4.8.147</version>
       <type>jar</type>
 	</location>
 	<!-- AssertJ -->
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index 47cc0f08b2..6ebc348271 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
@@ -1,9 +1,9 @@
 
-target "idempiere-220428"
+target "idempiere-220525"
 
 with source configurePhase allEnvironments
 
-location "https://idempiere.github.io/binary.file/p2.zk/9.6.1" {
+location "https://idempiere.github.io/binary.file/p2.zk/9.6.2" {
 	zcommon
 	zel
 	zhtml
@@ -28,6 +28,12 @@ location "https://idempiere.github.io/binary.file/p2.repackaged/9.0.0" {
 }
 
 location "https://download.eclipse.org/eclipse/updates/4.20" {
+	//dependency for com.google.http-client.google-http-client
+	org.apache.httpcomponents.httpclient
+	org.apache.httpcomponents.httpcore
+}
+
+location eclipse-2022-03 "https://download.eclipse.org/eclipse/updates/4.23" {
 	// equinox core framework
 	org.eclipse.osgi
 	//<< equinox framework starter kit
@@ -35,14 +41,15 @@ location "https://download.eclipse.org/eclipse/updates/4.20" {
 	org.apache.felix.gogo.runtime
 	org.apache.felix.gogo.shell
 	org.apache.felix.scr
-	org.apache.httpcomponents.httpclient
-	org.apache.httpcomponents.httpcore
+	org.apache.httpcomponents.client5.httpclient5
+	org.apache.httpcomponents.core5.httpcore5
+	org.apache.httpcomponents.core5.httpcore5-h2
 	org.eclipse.core.jobs
 	org.eclipse.ecf
 	org.eclipse.ecf.filetransfer
 	org.eclipse.ecf.identity
 	org.eclipse.ecf.provider.filetransfer
-	org.eclipse.ecf.provider.filetransfer.httpclient45
+	org.eclipse.ecf.provider.filetransfer.httpclient5
 	org.eclipse.ecf.provider.filetransfer.ssl
 	org.eclipse.equinox.app
 	org.eclipse.equinox.common
@@ -61,7 +68,7 @@ location "https://download.eclipse.org/eclipse/updates/4.20" {
 	org.eclipse.equinox.p2.jarprocessor
 	org.eclipse.equinox.p2.metadata
 	org.eclipse.equinox.p2.metadata.repository
-    org.eclipse.equinox.p2.operations
+	org.eclipse.equinox.p2.operations
 	org.eclipse.equinox.p2.repository
 	org.eclipse.equinox.p2.touchpoint.eclipse
 	org.eclipse.equinox.p2.touchpoint.natives
@@ -102,7 +109,7 @@ location "https://download.eclipse.org/eclipse/updates/4.20" {
 	org.eclipse.text	
 }
 
-location "https://download.eclipse.org/eclipse/updates/4.22" {
+location eclipse-2022-03 "https://download.eclipse.org/eclipse/updates/4.23" {
 	//<< for test
 	org.opentest4j
 	org.apiguardian	
@@ -124,7 +131,7 @@ location "https://download.eclipse.org/eclipse/updates/4.22" {
 	org.eclipse.jdt.junit5.runtime
 }
 
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
+location orbit-2021-06-R20210602031627 "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" {
 	org.apache.ant
 	org.apache.xml.resolver
 	org.w3c.css.sac
diff --git a/org.idempiere.p2/category.xml b/org.idempiere.p2/category.xml
index 44d0407e19..b9d0cb8f0a 100644
--- a/org.idempiere.p2/category.xml
+++ b/org.idempiere.p2/category.xml
@@ -45,7 +45,7 @@
    <feature url="features/org.idempiere.webservices.feature_10.0.0.qualifier.jar" id="org.idempiere.webservices.feature" version="10.0.0.qualifier">
       <category name="idempiere.server"/>
    </feature>
-   <feature url="features/org.eclipse.equinox.executable_3.8.1200.v20210527-0259.jar" id="org.eclipse.equinox.executable" version="3.8.1200.v20210527-0259">
+   <feature url="features/org.eclipse.equinox.executable_3.8.1200.v20210527-0259.jar" id="org.eclipse.equinox.executable" version="3.8.1500.v20220210-1108">
       <category name="idempiere.server"/>
    </feature>
    <feature id="org.idempiere.test.feature">
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 78f77b3274..ee097c97e9 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -12,11 +12,11 @@
 	<properties>
 		<revision>10.0.0-SNAPSHOT</revision>
 		<jdk.version>11</jdk.version>
-		<tycho.version>2.4.0</tycho.version>
+		<tycho.version>2.7.3</tycho.version>
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jp.version>6.17.0</jp.version>
-		<zk.version>9.6.1</zk.version>
+		<zk.version>9.6.2</zk.version>
 		<maven.dependency.version>3.1.1</maven.dependency.version>
 		<download.maven.version>1.4.1</download.maven.version>
 		<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
@@ -24,8 +24,8 @@
 		<maven-clean-plugin.version>2.5</maven-clean-plugin.version><!-- get from master, update when mave have update-->
 		<!-- default value of properties, use when run without profile -->
 		<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
-		<idempiere-equinox-url>https://download.eclipse.org/eclipse/updates/4.20</idempiere-equinox-url>
-		<idempiere-equinox-repository-id>eclipse-2021-06</idempiere-equinox-repository-id>
+		<idempiere-equinox-url>https://download.eclipse.org/eclipse/updates/4.23</idempiere-equinox-url>
+		<idempiere-equinox-repository-id>eclipse-2022-03</idempiere-equinox-repository-id>
 		<idempiere-orbit-url>https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository</idempiere-orbit-url>
 		<idempiere-orbit-repository-id>orbit-2021-06-R20210602031627</idempiere-orbit-repository-id>
 		<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
@@ -129,7 +129,7 @@
 											target-platform-configuration
 										</artifactId>
 										<versionRange>
-											[2.4.0,)
+											[2.7.0,)
 										</versionRange>
 										<goals>
 											<goal>target-platform</goal>
@@ -139,6 +139,48 @@
 										<ignore></ignore>
 									</action>
 								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-compiler-plugin
+										</artifactId>
+										<versionRange>
+											[2.7.3,)
+										</versionRange>
+										<goals>
+											<goal>
+												validate-classpath
+											</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.eclipse.tycho
+										</groupId>
+										<artifactId>
+											tycho-ds-plugin
+										</artifactId>
+										<versionRange>
+											[2.7.3,)
+										</versionRange>
+										<goals>
+											<goal>
+												declarative-services
+											</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>
@@ -186,7 +228,7 @@
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
-						        <artifactId>org.eclipse.ecf.provider.filetransfer.httpclient45</artifactId>
+						        <artifactId>org.eclipse.ecf.provider.filetransfer.httpclient5</artifactId>
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
@@ -226,7 +268,11 @@
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
-						        <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+						        <artifactId>org.apache.httpcomponents.core5.httpcore5</artifactId>
+						        <type>eclipse-plugin</type>
+					        </dependency>
+					        <dependency>
+						        <artifactId>org.apache.httpcomponents.core5.httpcore5-h2</artifactId>
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
@@ -278,7 +324,7 @@
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
-						        <artifactId>org.apache.httpcomponents.httpclient</artifactId>
+						        <artifactId>org.apache.httpcomponents.client5.httpclient5</artifactId>
 						        <type>eclipse-plugin</type>
 					        </dependency>
 					        <dependency>
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index 268b266535..256b8489c7 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -174,6 +174,9 @@
         <setEntry value="org.apache.geronimo.specs.geronimo-jms_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.httpcomponents.client5.httpclient5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5@default:default"/>
+        <setEntry value="org.apache.httpcomponents.core5.httpcore5-h2@default:default"/>
         <setEntry value="org.apache.neethi@default:default"/>
         <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.batik@default:default"/>
@@ -203,7 +206,7 @@
         <setEntry value="org.eclipse.core.variables@default:default"/>
         <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf.identity@default:default"/>
-        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient5@default:default"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
         <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
         <setEntry value="org.eclipse.ecf@default:default"/>
diff --git a/org.idempiere.test/pom.xml b/org.idempiere.test/pom.xml
index b971c53840..01fdb13c40 100644
--- a/org.idempiere.test/pom.xml
+++ b/org.idempiere.test/pom.xml
@@ -27,6 +27,7 @@
 					</argLine>
 					<testRuntime>p2Installed</testRuntime>
 					<skipTests>${skipTests}</skipTests>
+					<providerHint>junit58</providerHint>
 				</configuration>
 			</plugin>
 			<plugin>