diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index c94d776ec9..c1feb011e2 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index 466f3f6ad9..927103855d 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -12,6 +12,7 @@
https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip
+ 9.4.13.v20181111
1.1.3.v20160715
8.5.33
8.1.12.v20180117
@@ -32,6 +33,7 @@
3.1.17
1.2.0
1.3.2
+ 7.0
@@ -49,6 +51,10 @@
https://sourceforge.net/projects/jasperstudio/files/updatesite/6.6.0
p2
+
+ zkoss
+ http://mavensync.zkoss.org/maven2
+
@@ -126,11 +132,6 @@
false
-
org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version}
@@ -147,7 +148,7 @@
false
- org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14
+ org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.1
false
@@ -1195,6 +1196,273 @@ it also resolve issue confilic between eclipse runtime and tycho build
+
+ org.idempiere.asm.feature
+ ${asm.version}
+
+ Idempiere
+ feature group asm osgi bundle get from maven
+ Idempiere
+ GPL v2.1
+ true
+
+
+
+ org.ow2.asm:asm-commons:jar:${asm.version}
+
+ false
+
+
+ org.ow2.asm:asm-tree:jar:${asm.version}
+
+ false
+
+
+ org.ow2.asm:asm:jar:${asm.version}
+
+ false
+
+
+ org.ow2.asm:asm-analysis:jar:${asm.version}
+
+ false
+
+
+ org.ow2.asm:asm-util:jar:${asm.version}
+
+ false
+
+
+
+
+
+ org.idempiere.jetty.feature
+ ${jetty.version}
+
+ Idempiere
+ feature group jetty osgi bundle get from maven
+ Idempiere
+ GPL v2.1
+ true
+
+
+
+ org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-alpn-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-alpn-client:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-annotations:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:apache-jsp:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-client:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-continuation:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-deploy:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-http:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.http2:http2-client:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.http2:http2-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.http2:http2-common:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.http2:http2-hpack:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.http2:http2-http-client-transport:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-io:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-jaas:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-jmx:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-jndi:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.osgi:jetty-osgi-boot:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.osgi:jetty-osgi-alpn:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.osgi:jetty-osgi-boot-jsp:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.osgi:jetty-osgi-boot-warurl:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.osgi:jetty-httpservice:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-plus:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-proxy:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-rewrite:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-security:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-jaspi:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-servlet:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-servlets:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-util:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-webapp:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty:jetty-xml:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:websocket-api:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:websocket-client:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:websocket-common:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:websocket-server:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:websocket-servlet:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:${jetty.version}
+
+ false
+
+
+ org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:${jetty.version}
+
+ false
+
+
+
@@ -1409,7 +1677,7 @@ it also resolve issue confilic between eclipse runtime and tycho build
- ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.0.14.jar
+ ${url.file.srv}/jarfile/6.1/org.apache.aries.spifly.dynamic.bundle.source_1.1.jar
false
${project.build.directory}/repository/plugins
true
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index e60160ef4d..01a78820c0 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -890,8 +890,8 @@
-
-
+
+
@@ -1024,12 +1024,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1040,6 +1040,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1062,10 +1072,100 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 897dc38df0..f26b6ba71c 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -13,7 +13,6 @@
1.2.0
${tycho.version}
UTF-8
- 9.4.12.v20180830
6.7.0
8.6.0
3.23.1-GA