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 @@
+
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 @@
+
@@ -73,6 +74,7 @@
+
@@ -113,7 +115,6 @@
-
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 @@
+
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 @@
+
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 @@
+
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 @@
avalon-framework-api
4.3.1
-
- io.github.classgraph
- classgraph
- 4.8.116
-
lib
true
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 @@
+
@@ -62,6 +63,7 @@
+
@@ -96,7 +98,6 @@
-
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 @@
+
-
-
-
+
-
+
+
-
-
-
-
@@ -84,9 +80,8 @@
+
-
-
@@ -99,6 +94,12 @@
+
+
+
+
+
+
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 @@
+
@@ -60,6 +61,7 @@
+
@@ -93,7 +95,6 @@
-
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 @@
-
@@ -126,6 +125,7 @@
+
@@ -156,6 +156,7 @@
+
@@ -330,7 +331,6 @@
-
@@ -352,7 +352,6 @@
-
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 @@
+
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 @@
org.zkoss.zkforge
ckez
- 4.16.2.0
+ 4.17.1.0
com.googlecode.owasp-java-html-sanitizer
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
]]>
+
+
+ io.github.classgraph
+ classgraph
+ 4.8.138
+ jar
+
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 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1485,5 +1485,12 @@ Import-Package: *;resolution:=optional
Export-Package: *;version="${version}";-noimport:=true
]]>
+
+
+ io.github.classgraph
+ classgraph
+ 4.8.138
+ jar
+
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.version}
UTF-8
6.17.0
- 9.6.0.1
+ 9.6.1
3.1.1
1.4.1
1.0.0
@@ -537,11 +537,16 @@
https://maven.atlassian.com/3rdparty
+
+ idempiere-zkoss
+ https://idempiere.github.io/binary.file/maven.zk/
+
+
zkoss
https://mavensync.zkoss.org/maven2
-
+
jenkins
https://repo.jenkins-ci.org/releases
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 @@
+