From 0db580a7a0bda54db43736fa79aef4ab18e85121 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Tue, 25 Jan 2022 22:58:06 +0800
Subject: [PATCH] IDEMPIERE-5163 2022-01 Platform update (#1142)

---
 .../model.generator.launch                    |  1 +
 .../packinfolder.app.launch                   |  3 +-
 .../sign.database.build.launch                |  1 +
 .../synchronize-terminology.app.launch        |  1 +
 .../translation.app.launch                    |  1 +
 org.adempiere.base/META-INF/MANIFEST.MF       |  5 ++-
 org.adempiere.base/build.properties           |  3 +-
 org.adempiere.base/pom.xml                    |  5 ---
 org.adempiere.install/install.app.launch      |  3 +-
 .../install.console.app.launch                | 21 ++++++------
 .../install.silent.app.launch                 |  3 +-
 .../server.product.functionaltest.launch      |  5 ++-
 .../server.product.launch                     |  1 +
 .../setup/configuration/config.ini            |  3 +-
 org.adempiere.ui.zk/META-INF/MANIFEST.MF      |  3 +-
 org.adempiere.ui.zk/pom.xml                   |  2 +-
 .../maven.locations.xml                       |  7 ++++
 .../org.idempiere.p2.targetplatform.target    | 33 +++++++++++--------
 .../org.idempiere.p2.targetplatform.tpd       |  4 +--
 org.idempiere.parent/pom.xml                  |  9 +++--
 org.idempiere.test/idempiere.unit.test.launch |  1 +
 21 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index 53e3c3fa1d..50a4da76d2 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -45,6 +45,7 @@
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 4424633361..3d4426f1fa 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -53,6 +53,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
@@ -73,6 +74,7 @@
         <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.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.xerces@default:default"/>
         <setEntry value="org.apache.xml.resolver@default:default"/>
@@ -113,7 +115,6 @@
         <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
         <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
-        <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
         <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 9ebc39c987..3f44c64fb6 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -54,6 +54,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index 9510ab6c98..0ce09df240 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -54,6 +54,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index 93eb9c23ed..e44bf93b83 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -54,6 +54,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 5f807a082b..7ab830a2f6 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-ClassPath: .,
  lib/bsh.jar,
  lib/commons-validator.jar,
  lib/cron4j.jar,
- lib/avalon-framework-api.jar,
- lib/classgraph.jar
+ lib/avalon-framework-api.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
@@ -19,7 +18,6 @@ Export-Package: bsh,
  bsh.servlet,
  bsh.util,
  com.akunagroup.uk.postcode,
- io.github.classgraph,
  it.sauronsoftware.cron4j,
  org.adempiere.apps.graph,
  org.adempiere.base,
@@ -71,6 +69,7 @@ Import-Package: com.google.zxing,
  com.google.zxing.qrcode.decoder,
  com.google.zxing.qrcode.encoder,
  com.sun.mail.smtp;version="1.5",
+ io.github.classgraph;version="4.8.138",
  io.grpc;version="1.27.0",
  io.opencensus.common;version="0.28.0",
  io.opencensus.contrib.http;version="0.28.0",
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 322ef11898..3efca01f4c 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -6,8 +6,7 @@ bin.includes = plugin.xml,\
                lib/avalon-framework-api.jar,\
                lib/bsh.jar,\
                lib/commons-validator.jar,\
-               lib/cron4j.jar,\
-               lib/classgraph.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 93842ace50..e22b69cd11 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -43,11 +43,6 @@
 									<artifactId>avalon-framework-api</artifactId>
 									<version>4.3.1</version>
 								</artifactItem>
-								<artifactItem>
-									<groupId>io.github.classgraph</groupId>
-								    <artifactId>classgraph</artifactId>
-								    <version>4.8.116</version>
-								</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 c3ee7d21fe..9a586fcacb 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -43,6 +43,7 @@
         <setEntry value="com.sun.mail.gimap@default:default"/>
         <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
@@ -62,6 +63,7 @@
         <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.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
         <setEntry value="org.cryptacular@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
@@ -96,7 +98,6 @@
         <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
         <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
-        <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
         <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index b1e2437927..ee66a1d626 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -43,31 +43,27 @@
         <setEntry value="com.sun.mail.gimap@default:default"/>
         <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
-        <setEntry value="org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
         <setEntry value="org.antlr.antlr4-runtime@default:default"/>
         <setEntry value="org.apache.activemq.activemq-client@default:default"/>
-        <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
         <setEntry value="org.apache.ant@default:default"/>
-        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.collections@default:default"/>
+        <setEntry value="org.apache.commons.commons-codec@default:default"/>
         <setEntry value="org.apache.commons.commons-collections4@default:default"/>
         <setEntry value="org.apache.commons.commons-compress@default:default"/>
-        <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.commons.commons-net@default:default"/>
+        <setEntry value="org.apache.commons.logging@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.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.poi.ooxml-schemas@default:default"/>
-        <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
-        <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
-        <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
         <setEntry value="org.cryptacular@default:default"/>
-        <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
         <setEntry value="org.eclipse.core.contenttype@default:default"/>
         <setEntry value="org.eclipse.core.jobs@default:default"/>
@@ -84,9 +80,8 @@
         <setEntry value="org.eclipse.osgi.services@default:default"/>
         <setEntry value="org.eclipse.osgi.util@default:default"/>
         <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
         <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
-        <setEntry value="wrapped.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"/>
@@ -99,6 +94,12 @@
         <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="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
+        <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
+        <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
+        <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
+        <setEntry value="wrapped.org.jfree.jcommon@default:default"/>
+        <setEntry value="wrapped.org.jfree.jfreechart@default:default"/>
         <setEntry value="xstream@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
diff --git a/org.adempiere.install/install.silent.app.launch b/org.adempiere.install/install.silent.app.launch
index 2cd293f0ac..f1c580935d 100644
--- a/org.adempiere.install/install.silent.app.launch
+++ b/org.adempiere.install/install.silent.app.launch
@@ -43,6 +43,7 @@
         <setEntry value="com.sun.mail.gimap@default:default"/>
         <setEntry value="com.sun.mail.jakarta.mail@default:default"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="net.sf.supercsv.super-csv@default:default"/>
@@ -60,6 +61,7 @@
         <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.poi.ooxml-schemas@default:default"/>
         <setEntry value="org.apache.servicemix.bundles.cglib@default:default"/>
         <setEntry value="org.cryptacular@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
@@ -93,7 +95,6 @@
         <setEntry value="wrapped.io.opencensus.opencensus-api@default:default"/>
         <setEntry value="wrapped.io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="wrapped.org.apache.activemq.activemq-kahadb-store@default:default"/>
-        <setEntry value="org.apache.poi.ooxml-schemas@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi-ooxml@default:default"/>
         <setEntry value="wrapped.org.apache.poi.poi@default:default"/>
         <setEntry value="wrapped.org.apache.xmlbeans.xmlbeans@default:default"/>
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index 728d5175e2..e32d6e7c7f 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -105,7 +105,6 @@
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
-        <setEntry value="org.apache.commons.digester@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.istack.commons-runtime@default:default"/>
@@ -126,6 +125,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.jws-api@default:default"/>
         <setEntry value="jakarta.persistence-api@default:default"/>
@@ -156,6 +156,7 @@
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.commons-net@default:default"/>
         <setEntry value="org.apache.commons.commons-text@default:default"/>
+        <setEntry value="org.apache.commons.digester@default:default"/>
         <setEntry value="org.apache.commons.discovery@default:default"/>
         <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.lang@default:default"/>
@@ -330,7 +331,6 @@
         <setEntry value="org.w3c.dom.svg@default:default"/>
         <setEntry value="org.zkoss.zsoup@default:default"/>
         <setEntry value="slf4j.api*1.7.30@default:default"/>
-        <setEntry value="slf4j.api*2.0.0.alpha1@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"/>
@@ -352,7 +352,6 @@
         <setEntry value="wrapped.org.springframework.spring-context@default:default"/>
         <setEntry value="wrapped.org.springframework.spring-core@default:default"/>
         <setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
-        <setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
         <setEntry value="wrapped.org.springframework.spring-web@default:default"/>
         <setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
         <setEntry value="xstream@default:default"/>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 45f5568f7d..a6d7010632 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -126,6 +126,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.jws-api@default:default"/>
         <setEntry value="jakarta.persistence-api@default:default"/>
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 862e921622..0dc73f8ad8 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -80,7 +80,8 @@ osgi.bundles=org.apache.felix.scr@1:start,\
  wrapped.dev.samstevens.totp.totp,\
  org.antlr.antlr4-runtime,\
  xstream,\
- org.fusesource.hawtbuf.hawtbuf
+ org.fusesource.hawtbuf.hawtbuf,\
+ io.github.classgraph.classgraph
 osgi.framework.extensions=
 osgi.bundles.defaultStartLevel=4
 osgi.compatibility.bootdelegation=true
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 742a55b1e8..ba4c97bcb9 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Import-Package: com.google.common.annotations;version="30.1.1",
  com.google.common.reflect;version="30.1.1",
  com.google.common.util.concurrent;version="30.1.1",
  groovy.transform.stc;version="2.4.7",
+ io.github.classgraph;version="4.8.138",
  javax.annotation,
  javax.annotation.processing,
  javax.annotation.security,
@@ -133,8 +134,6 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.ckez.ext.CKeditor.plugins.dialog,
  web.js.ckez.ext.CKeditor.plugins.div.dialogs,
  web.js.ckez.ext.CKeditor.plugins.find.dialogs,
- web.js.ckez.ext.CKeditor.plugins.flash.dialogs,
- web.js.ckez.ext.CKeditor.plugins.flash.images,
  web.js.ckez.ext.CKeditor.plugins.forms.dialogs,
  web.js.ckez.ext.CKeditor.plugins.forms.images,
  web.js.ckez.ext.CKeditor.plugins.iframe.dialogs,
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index e128fce096..d557438ec1 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.2.0</version>
+									<version>4.17.1.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index 4efdac5310..b2c4e902df 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -1348,4 +1348,11 @@ Import-Package:        *;resolution:=optional
 Export-Package:        *;version="${version}";-noimport:=true
 ]]></instructions>
 	</location>
+	<!-- classgraph -->
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <version>4.8.138</version>
+      <type>jar</type>
+	</location>
 </locations>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b456059e55..2d424c21c7 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-210901" sequenceNumber="1640585624">
+<target name="idempiere-220124" sequenceNumber="1643026597">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="zcommon" version="9.6.0.1"/>
-      <unit id="zel" version="9.6.0.1"/>
-      <unit id="zhtml" version="9.6.0.1"/>
-      <unit id="zjavassist" version="9.6.0.1"/>
-      <unit id="zk" version="9.6.0.1"/>
-      <unit id="zkbind" version="9.6.0.1"/>
-      <unit id="zkplus" version="9.6.0.1"/>
-      <unit id="zkwebfragment" version="9.6.0.1"/>
-      <unit id="zul" version="9.6.0.1"/>
-      <unit id="zweb" version="9.6.0.1"/>
-      <unit id="zweb-dsp" version="9.6.0.1"/>
-      <repository location="https://idempiere.github.io/binary.file/p2.zk/9.6.0.1"/>
+      <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"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="jakarta.xml.ws-api" version="2.3.3.v202109010034"/>
@@ -1485,5 +1485,12 @@ Import-Package:        *;resolution:=optional
 Export-Package:        *;version="${version}";-noimport:=true
 ]]></instructions>
 	</location>
+	<!-- classgraph -->
+	<location includeSource="true" missingManifest="generate" type="Maven">
+	  <groupId>io.github.classgraph</groupId>
+      <artifactId>classgraph</artifactId>
+      <version>4.8.138</version>
+      <type>jar</type>
+	</location>
   </locations>
 </target>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.tpd
index b8c511a1ed..94ec1659ca 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-210901"
+target "idempiere-220124"
 
 with source configurePhase allEnvironments
 
-location "https://idempiere.github.io/binary.file/p2.zk/9.6.0.1" {
+location "https://idempiere.github.io/binary.file/p2.zk/9.6.1" {
 	zcommon
 	zel
 	zhtml
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 13b6178440..78f77b3274 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -16,7 +16,7 @@
 		<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.0.1</zk.version>
+		<zk.version>9.6.1</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>
@@ -537,11 +537,16 @@
 		            <url>https://maven.atlassian.com/3rdparty</url>
 	            </repository>
 
+				<repository>
+					<id>idempiere-zkoss</id>
+					<url>https://idempiere.github.io/binary.file/maven.zk/</url>
+				</repository>
+				
 	            <repository>
 		            <id>zkoss</id>
 		            <url>https://mavensync.zkoss.org/maven2</url>
 	            </repository>
-
+	            
 	            <repository>
 		            <id>jenkins</id>
 		            <url>https://repo.jenkins-ci.org/releases</url>
diff --git a/org.idempiere.test/idempiere.unit.test.launch b/org.idempiere.test/idempiere.unit.test.launch
index bf17f875ef..902b4fc8ec 100644
--- a/org.idempiere.test/idempiere.unit.test.launch
+++ b/org.idempiere.test/idempiere.unit.test.launch
@@ -84,6 +84,7 @@
         <setEntry value="groovy-sql@default:false"/>
         <setEntry value="groovy-xml@default:false"/>
         <setEntry value="groovy@default:default"/>
+        <setEntry value="io.github.classgraph.classgraph@default:default"/>
         <setEntry value="jakarta.annotation-api@default:default"/>
         <setEntry value="jakarta.jws-api@default:default"/>
         <setEntry value="jakarta.persistence-api@default:default"/>