diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index d1e4f62fbc..1d2d027e22 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -13,19 +13,19 @@
         <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.equinox.simpleconfigurator:1.4.0.v20210315-2228:default:true:1:true"/>
-        <setEntry value="org.eclipse.jetty.annotations:10.0.6:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.apache-jsp:10.0.6:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.http:10.0.6:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.osgi.boot:10.0.6:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.osgi.httpservice:10.0.6:default:true:default:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.common:10.0.6:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.core.server:10.0.6:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.javax.common:10.0.6:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.javax.server:10.0.6:default:true:3:true"/>
-        <setEntry value="org.eclipse.jetty.websocket.server:10.0.6:default:true:3: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.idempiere.felix.webconsole:9.0.0.qualifier:default:true:default:true"/>
-        <setEntry value="org.mortbay.jasper.apache-el:9.0.29:default:true:default:true"/>
-        <setEntry value="org.mortbay.jasper.apache-jsp:9.0.29: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"/>
     </setAttribute>
     <booleanAttribute key="append.args" value="true"/>
     <stringAttribute key="application" value="org.adempiere.server.application"/>
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index b2a4f1a5ea..e128fce096 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.16.1.1</version>
+									<version>4.16.2.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
diff --git a/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
index 88051d4983..d510a82d4c 100644
--- a/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
+++ b/org.idempiere.jetty.osgi.boot.fragment/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Jetty OSGI  Boot Fragment
 Bundle-SymbolicName: org.idempiere.jetty.osgi.boot.fragment
 Bundle-Version: 9.0.0.qualifier
-Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.6"
+Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.7"
 Automatic-Module-Name: org.idempiere.jetty.logging.fragment
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.adempiere.base;bundle-version="9.0.0"
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index dc2cbd4e34..4efdac5310 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -282,11 +282,23 @@ Export-Package:        *;-noimport:=true
       <version>4.0.3</version>
       <type>jar</type>
     </location>	
-	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
+	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.glassfish.pfl</groupId>
       <artifactId>pfl-tf</artifactId>
       <version>4.1.2</version>
       <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.glassfish.pfl</groupId>
+      <artifactId>pfl-dynamic</artifactId>
+      <version>4.1.2</version>
+      <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.glassfish.pfl</groupId>
+      <artifactId>pfl-basic</artifactId>
+      <version>4.1.2</version>
+      <type>jar</type>
     </location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.glassfish.pfl</groupId>
@@ -562,7 +574,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 ]]></instructions>
 	</location>
 	<!-- org.apache.aries -->
-	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
+	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.apache.aries.spifly</groupId>
       <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
       <version>1.3.3</version>
@@ -1161,133 +1173,139 @@ 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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.mortbay.jasper</groupId>
       <artifactId>apache-el</artifactId>
-      <version>9.0.29</version>
+      <version>9.0.52</version>
 	  <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaas</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>9.2</version>
       <type>jar</type>
 	</location>	
 	<!-- org.slf4j -->
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 40fff5c98a..393f7af5e4 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-210901" sequenceNumber="1635250903">
+<target name="idempiere-210901" sequenceNumber="1636543592">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="zcommon" version="9.6.0.1"/>
@@ -414,11 +414,23 @@ Export-Package:        *;-noimport:=true
       <version>4.0.3</version>
       <type>jar</type>
     </location>	
-	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
+	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.glassfish.pfl</groupId>
       <artifactId>pfl-tf</artifactId>
       <version>4.1.2</version>
       <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.glassfish.pfl</groupId>
+      <artifactId>pfl-dynamic</artifactId>
+      <version>4.1.2</version>
+      <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.glassfish.pfl</groupId>
+      <artifactId>pfl-basic</artifactId>
+      <version>4.1.2</version>
+      <type>jar</type>
     </location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.glassfish.pfl</groupId>
@@ -694,7 +706,7 @@ Export-Package:        *;version="${version}";-noimport:=true
 ]]></instructions>
 	</location>
 	<!-- org.apache.aries -->
-	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
+	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.apache.aries.spifly</groupId>
       <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
       <version>1.3.3</version>
@@ -1293,133 +1305,139 @@ 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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.mortbay.jasper</groupId>
       <artifactId>apache-el</artifactId>
-      <version>9.0.29</version>
+      <version>9.0.52</version>
 	  <type>jar</type>
 	</location>
 	<location includeDependencyScope="compile" includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-deploy</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jndi</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jaas</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</version>
       <type>jar</type>
 	</location>
 	<location includeSource="true" missingManifest="generate" type="Maven">
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>10.0.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</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.6</version>
+      <version>10.0.7</version>
+      <type>jar</type>
+	</location>
+	<location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>9.2</version>
       <type>jar</type>
 	</location>	
 	<!-- org.slf4j -->