diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index e867789674..cc7a8d75f0 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -499,13 +499,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="javax.jws-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.sun.activation.javax.activation"
          download-size="0"
@@ -513,4 +506,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="javax.jws"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 1732f20332..8b5116ae38 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -533,4 +533,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.jetty.continuation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 3908e78e97..8e69e34d29 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -260,20 +260,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="javax.xml.soap-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.rpc-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.sun.activation.javax.activation"
          download-size="0"
@@ -365,4 +351,71 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.cxf.cxf-rt-transports-http-jetty"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-ws-addr"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-ws-policy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.axis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="javax.xml.rpc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="javax.xml.soap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-databinding-xmlbeans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.cxf.cxf-rt-rs-extension-providers"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.ws.rs-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
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 bb33ce8758..a4273a355e 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
@@ -96,6 +96,11 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 										<artifact>
 										    <!-- it's maintain and up to date than org.eclipse.jdt.core.compiler.batch -->
 											<id>org.eclipse.jdt:org.eclipse.jdt.core:jar:${jdtVersion}</id>
@@ -471,6 +476,11 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-transports-http-jetty:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 										<artifact>
 											<id>org.apache.cxf:cxf-rt-bindings-soap:jar:${apache.cxf.version}</id>
 											<source>true</source>
@@ -491,11 +501,71 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-spring-boot-autoconfigure:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-http-sci:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 										<artifact>
 											<id>org.apache.cxf:cxf-rt-databinding-jaxb:jar:${apache.cxf.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-addr:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-policy:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-rs-service-description:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-management:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-ws-transfer:jar:${apache.cxf.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:3.1.17</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.cxf:cxf-rt-bindings-object:jar:3.1.17</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.xmlbeans:xmlbeans:jar:3.0.1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j:jar:1.6.3_1</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 										<artifact>
 											<id>org.apache.neethi:neethi:jar:3.1.1</id>
 											<source>true</source>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 05a1a5ea71..c61a3349e0 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -764,14 +764,6 @@
 		<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.12.v20180830"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<unit id="bcmail" version="1.60.0"/>
-		<unit id="bcmail.source" version="1.60.0"/>
-		<unit id="bcpkix" version="1.60.0"/>
-		<unit id="bcpkix.source" version="1.60.0"/>
-		<unit id="bcprov" version="1.60.0"/>
-		<unit id="bcprov.source" version="1.60.0"/>
-		<unit id="bctsp" version="1.46.0"/>
-		<unit id="bctsp.source" version="1.46.0"/>
 		<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.5"/>
 		<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="2.9.5"/>
 		<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.5"/>
@@ -800,12 +792,82 @@
 		<unit id="com.fasterxml.woodstox.woodstox-core.source" version="5.0.3"/>
 		<unit id="com.google.zxing.core" version="3.2.1"/>
 		<unit id="com.google.zxing.core.source" version="3.2.1"/>
+		<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
+		<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
+		<unit id="javax.validation.api" version="1.1.0.Final"/>
+		<unit id="javax.validation.api.source" version="1.1.0.Final"/>
+		<unit id="json" version="20171018.0.0"/>
+		<unit id="json.source" version="20171018.0.0"/>
+		<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
+		<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
+		<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
+		<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/>
+		<unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
+		<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.swing" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.transcoder" version="1.9.1.v20180313-1559"/>
+		<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
+		<unit id="org.apache.commons.digester" version="2.1.0"/>
+		<unit id="org.apache.commons.digester.source" version="2.1.0"/>
+		<unit id="org.apache.poi.poi" version="3.15.0"/>
+		<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
+		<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
+		<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
+		<unit id="org.apache.poi.poi.source" version="3.15.0"/>
+		<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
+		<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
+		<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
+		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
+		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
+		<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
+		<unit id="org.krysalis.barcode4j" version="2.1.0"/>
+		<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
+		<unit id="stax2-api" version="3.1.4"/>
+		<unit id="stax2-api.source" version="3.1.4"/>
+		<unit id="zcommon" version="8.5.0"/>
+		<unit id="zcommon.sources" version="8.5.0"/>
+		<unit id="zel" version="8.5.0"/>
+		<unit id="zel.sources" version="8.5.0"/>
+		<unit id="zhtml" version="8.5.0"/>
+		<unit id="zhtml.sources" version="8.5.0"/>
+		<unit id="zjavassist" version="8.5.0"/>
+		<unit id="zjavassist.sources" version="8.5.0"/>
+		<unit id="zk" version="8.5.0"/>
+		<unit id="zk.sources" version="8.5.0"/>
+		<unit id="zkbind" version="8.5.0"/>
+		<unit id="zkbind.sources" version="8.5.0"/>
+		<unit id="zkplus" version="8.5.0"/>
+		<unit id="zkplus.sources" version="8.5.0"/>
+		<unit id="zul" version="8.5.0"/>
+		<unit id="zul.sources" version="8.5.0"/>
+		<unit id="zweb" version="8.5.0"/>
+		<unit id="zweb.sources" version="8.5.0"/>
+		<repository location="file:/home/hieplq/1Dev/project/native/idempiere-dev-11/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/target/repository/"/>
+		<unit id="bcmail" version="1.60.0"/>
+		<unit id="bcmail.source" version="1.60.0"/>
+		<unit id="bcpkix" version="1.60.0"/>
+		<unit id="bcpkix.source" version="1.60.0"/>
+		<unit id="bcprov" version="1.60.0"/>
+		<unit id="bcprov.source" version="1.60.0"/>
+		<unit id="bctsp" version="1.46.0"/>
+		<unit id="bctsp.source" version="1.46.0"/>
 		<unit id="com.ibm.icu" version="63.1.0"/>
 		<unit id="com.ibm.icu.source" version="63.1.0"/>
 		<unit id="com.itextpdf" version="5.5.13"/>
 		<unit id="com.itextpdf.source" version="5.5.13"/>
-		<unit id="com.jaspersoft.studio.bundles.barbecue" version="1.5.0.beta1_b02"/>
-		<unit id="com.jaspersoft.studio.bundles.itext" version="2.1.7.js6_b02"/>
 		<unit id="com.sun.activation.javax.activation" version="1.2.0"/>
 		<unit id="com.sun.activation.javax.activation.source" version="1.2.0"/>
 		<unit id="com.sun.mail.javax.mail" version="1.6.2"/>
@@ -862,8 +924,6 @@
 		<unit id="javax.jws-api.source" version="1.1.0"/>
 		<unit id="javax.transaction-api" version="1.3.0"/>
 		<unit id="javax.transaction-api.source" version="1.3.0"/>
-		<unit id="javax.validation.api" version="1.1.0.Final"/>
-		<unit id="javax.validation.api.source" version="1.1.0.Final"/>
 		<unit id="javax.websocket-api" version="1.1.0"/>
 		<unit id="javax.websocket-api.source" version="1.1.0"/>
 		<unit id="javax.ws.rs-api" version="2.1.99.b01"/>
@@ -880,10 +940,6 @@
 		<unit id="jaxws-api.source" version="2.3.1"/>
 		<unit id="joda-time" version="2.10.0"/>
 		<unit id="joda-time.source" version="2.10.0"/>
-		<unit id="json" version="20171018.0.0"/>
-		<unit id="json.source" version="20171018.0.0"/>
-		<unit id="net.sf.jasperreports.engine" version="6.6.0"/>
-		<unit id="net.sf.jasperreports.engine.source" version="6.6.0"/>
 		<unit id="net.sf.supercsv.super-csv" version="2.4.0"/>
 		<unit id="net.sf.supercsv.super-csv.source" version="2.4.0"/>
 		<unit id="org.apache.activemq.activemq-core" version="5.7.0"/>
@@ -894,54 +950,54 @@
 		<unit id="org.apache.aries.spifly.dynamic.bundle.source" version="1.0.14"/>
 		<unit id="org.apache.aries.util" version="1.1.3"/>
 		<unit id="org.apache.aries.util.source" version="1.1.3"/>
-		<unit id="org.apache.batik.anim" version="1.9.1.v20180528-1434"/>
-		<unit id="org.apache.batik.bridge" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.codec" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.constants" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.css" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.dom" version="1.9.1.v20180528-1434"/>
-		<unit id="org.apache.batik.dom.svg" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.ext.awt" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.extension" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.gvt" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.i18n" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.parser" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.pdf" version="1.9.1.v20180417-1407"/>
-		<unit id="org.apache.batik.script" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.svggen" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.swing" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.transcoder" version="1.9.1.v20180313-1559"/>
-		<unit id="org.apache.batik.util" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.util.gui" version="1.9.1.v20180227-1645"/>
-		<unit id="org.apache.batik.xml" version="1.9.1.v20180227-1645"/>
 		<unit id="org.apache.commons.commons-collections4" version="4.2.0"/>
 		<unit id="org.apache.commons.commons-collections4.source" version="4.2.0"/>
 		<unit id="org.apache.commons.commons-configuration2" version="2.3.0"/>
 		<unit id="org.apache.commons.commons-configuration2.source" version="2.3.0"/>
-		<unit id="org.apache.commons.digester" version="2.1.0"/>
-		<unit id="org.apache.commons.digester.source" version="2.1.0"/>
 		<unit id="org.apache.commons.discovery" version="0.5.0"/>
 		<unit id="org.apache.commons.discovery.source" version="0.5.0"/>
 		<unit id="org.apache.commons.javaflow" version="1590792.0.0"/>
 		<unit id="org.apache.commons.javaflow.source" version="1590792.0.0"/>
 		<unit id="org.apache.cxf.cxf-core" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-core.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-object" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-bindings-object.source" version="3.1.17"/>
 		<unit id="org.apache.cxf.cxf-rt-bindings-soap" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-bindings-soap.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-bindings-xml" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-bindings-xml.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-databinding-jaxb" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-databinding-jaxb.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans" version="3.1.17"/>
+		<unit id="org.apache.cxf.cxf-rt-databinding-xmlbeans.source" version="3.1.17"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-jaxrs.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-jaxws" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-jaxws.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-simple" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-frontend-simple.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-management" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-management.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-extension-providers" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-extension-providers.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-http-sci" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-http-sci.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-service-description" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-rs-service-description.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-transports-http" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http-jetty" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-transports-http-jetty.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-transports-http.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-addr" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-addr.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-policy" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-rt-ws-policy.source" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-wsdl" version="3.2.6"/>
 		<unit id="org.apache.cxf.cxf-rt-wsdl.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure" version="3.2.6"/>
+		<unit id="org.apache.cxf.cxf-spring-boot-autoconfigure.source" version="3.2.6"/>
+		<unit id="org.apache.cxf.rt-ws-transfer" version="3.2.6"/>
+		<unit id="org.apache.cxf.rt-ws-transfer.source" version="3.2.6"/>
 		<unit id="org.apache.felix.inventory" version="1.0.6"/>
 		<unit id="org.apache.felix.inventory.source" version="1.0.6"/>
 		<unit id="org.apache.felix.webconsole" version="4.3.8"/>
@@ -956,16 +1012,10 @@
 		<unit id="org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec.source" version="1.0.1"/>
 		<unit id="org.apache.neethi" version="3.1.1"/>
 		<unit id="org.apache.neethi.source" version="3.1.1"/>
-		<unit id="org.apache.poi.poi" version="3.15.0"/>
-		<unit id="org.apache.poi.poi-ooxml" version="3.15.0"/>
-		<unit id="org.apache.poi.poi-ooxml-schemas" version="3.15.0"/>
-		<unit id="org.apache.poi.poi-ooxml.source" version="3.15.0"/>
-		<unit id="org.apache.poi.poi.source" version="3.15.0"/>
 		<unit id="org.apache.servicemix.bundles.cglib" version="3.2.6.1"/>
 		<unit id="org.apache.servicemix.bundles.cglib.source" version="3.2.6.1"/>
-		<unit id="org.apache.servicemix.bundles.jaxen" version="1.1.1.2"/>
-		<unit id="org.apache.servicemix.bundles.rhino" version="1.7.6.1"/>
-		<unit id="org.apache.servicemix.bundles.rhino.source" version="1.7.6.1"/>
+		<unit id="org.apache.servicemix.bundles.wsdl4j" version="1.6.3.1"/>
+		<unit id="org.apache.servicemix.bundles.wsdl4j.source" version="1.6.3.1"/>
 		<unit id="org.apache.taglibs.standard-impl" version="1.2.5"/>
 		<unit id="org.apache.taglibs.standard-impl.source" version="1.2.5"/>
 		<unit id="org.apache.taglibs.standard-jstlel" version="1.2.5"/>
@@ -976,7 +1026,7 @@
 		<unit id="org.apache.velocity.source" version="1.7.0"/>
 		<unit id="org.apache.ws.xmlschema.core" version="2.2.3"/>
 		<unit id="org.apache.ws.xmlschema.core.source" version="2.2.3"/>
-		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
+		<unit id="org.apache.xmlbeans" version="3.0.1"/>
 		<unit id="org.atmosphere.runtime" version="2.5.0"/>
 		<unit id="org.atmosphere.runtime.source" version="2.5.0"/>
 		<unit id="org.cryptacular" version="1.2.2"/>
@@ -989,13 +1039,12 @@
 		<unit id="org.eclipse.jetty.alpn.conscrypt.server.source" version="9.4.12.v20180830"/>
 		<unit id="org.eclipse.jetty.alpn.openjdk8.server" version="9.4.12.v20180830"/>
 		<unit id="org.eclipse.jetty.alpn.openjdk8.server.source" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.continuation" version="9.4.12.v20180830"/>
+		<unit id="org.eclipse.jetty.continuation.source" version="9.4.12.v20180830"/>
 		<unit id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
 		<unit id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
 		<unit id="org.idempiere.org.conscrypt.openjdk-uber" version="1.4.0"/>
 		<unit id="org.idempiere.org.conscrypt.openjdk-uber.source" version="1.4.0"/>
-		<unit id="org.jfree.chart-osgi" version="1.0.19"/>
-		<unit id="org.jfree.jcommon-osgi" version="1.0.23"/>
-		<unit id="org.krysalis.barcode4j" version="2.1.0"/>
 		<unit id="org.mortbay.jasper.apache-el" version="8.5.33"/>
 		<unit id="org.mortbay.jasper.apache-el.source" version="8.5.33"/>
 		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
@@ -1003,8 +1052,12 @@
 		<unit id="org.passay.source" version="1.3.1"/>
 		<unit id="org.springframework.aop" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.aop.source" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.asm" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.asm.source" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.beans" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.beans.source" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.context" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.context.source" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.core" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.core.source" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.expression" version="3.1.4.RELEASE"/>
@@ -1017,42 +1070,14 @@
 		<unit id="org.springframework.osgi.io.source" version="1.2.1"/>
 		<unit id="org.springframework.web" version="3.1.4.RELEASE"/>
 		<unit id="org.springframework.web.source" version="3.1.4.RELEASE"/>
-		<unit id="org.w3c.dom.svg.patch" version="1.1.0.b02"/>
 		<unit id="slf4j.api" version="1.7.25"/>
 		<unit id="slf4j.api.source" version="1.7.25"/>
 		<unit id="slf4j.jcl" version="1.7.25"/>
 		<unit id="slf4j.jcl.source" version="1.7.25"/>
 		<unit id="slf4j.jdk14" version="1.7.25"/>
 		<unit id="slf4j.jdk14.source" version="1.7.25"/>
-		<unit id="stax2-api" version="3.1.4"/>
 		<unit id="stax2-api" version="4.1.0"/>
-		<unit id="stax2-api.source" version="3.1.4"/>
 		<unit id="stax2-api.source" version="4.1.0"/>
-		<unit id="zcommon" version="8.5.0"/>
-		<unit id="zcommon.sources" version="8.5.0"/>
-		<unit id="zel" version="8.5.0"/>
-		<unit id="zel.sources" version="8.5.0"/>
-		<unit id="zhtml" version="8.5.0"/>
-		<unit id="zhtml.sources" version="8.5.0"/>
-		<unit id="zjavassist" version="8.5.0"/>
-		<unit id="zjavassist.sources" version="8.5.0"/>
-		<unit id="zk" version="8.5.0"/>
-		<unit id="zk.sources" version="8.5.0"/>
-		<unit id="zkbind" version="8.5.0"/>
-		<unit id="zkbind.sources" version="8.5.0"/>
-		<unit id="zkplus" version="8.5.0"/>
-		<unit id="zkplus.sources" version="8.5.0"/>
-		<unit id="zul" version="8.5.0"/>
-		<unit id="zul.sources" version="8.5.0"/>
-		<unit id="zweb" version="8.5.0"/>
-		<unit id="zweb.sources" version="8.5.0"/>
-		<repository location="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181021"/>
-		<unit id="aopalliance" version="1.0.0"/>
-		<unit id="aopalliance.source" version="1.0.0"/>
-		<unit id="org.springframework.asm" version="3.1.4.RELEASE"/>
-		<unit id="org.springframework.asm.source" version="3.1.4.RELEASE"/>
-		<unit id="org.springframework.context" version="3.1.4.RELEASE"/>
-		<unit id="org.springframework.context.source" version="3.1.4.RELEASE"/>
 	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 8d0ff468ec..83a96b9803 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -7,9 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src/"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 7e7aca32d8..cb398ab5be 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -12,13 +12,6 @@ Import-Package: javax.activation,
  javax.mail.internet;version="1.5",
  javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
- javax.xml.rpc,
- javax.xml.rpc.encoding,
- javax.xml.rpc.handler,
- javax.xml.rpc.handler.soap,
- javax.xml.rpc.holders,
- javax.xml.rpc.server,
- javax.xml.rpc.soap,
  net.sf.jasperreports.engine,
  net.sf.jasperreports.engine.base,
  net.sf.jasperreports.engine.util,
@@ -78,8 +71,6 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6",
  org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6",
  jaxws-api;bundle-version="0.0.0",
- javax.jws-api;bundle-version="1.1.0",
- javax.xml.soap-api;bundle-version="1.4.0",
  org.springframework.aop;bundle-version="3.1.4",
  org.springframework.beans;bundle-version="3.1.4",
  org.springframework.core;bundle-version="3.1.4",
@@ -90,112 +81,23 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.springframework.web;bundle-version="3.1.4",
  org.springframework.asm;bundle-version="3.1.4",
  org.springframework.context;bundle-version="3.1.4",
- org.aopalliance;bundle-version="1.0.0"
+ org.aopalliance;bundle-version="1.0.0",
+ org.apache.xml.resolver;bundle-version="1.2.0",
+ org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.2.6",
+ org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6",
+ javax.wsdl;bundle-version="1.6.2",
+ org.apache.axis;bundle-version="1.4.0",
+ javax.xml.soap;bundle-version="1.3.0",
+ javax.xml.rpc;bundle-version="1.1.0",
+ org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17",
+ org.apache.xmlbeans;bundle-version="3.0.1",
+ javax.jws;bundle-version="2.0.0",
+ org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.2.6",
+ javax.ws.rs-api;bundle-version="2.1.99"
 Bundle-ClassPath: .,
- WEB-INF/lib/aopalliance.jar,
- WEB-INF/lib/axis.jar,
- WEB-INF/lib/idempiere-xmlbeans.jar,
- WEB-INF/lib/xmlbeans.jar
-Export-Package: org.apache.axis,
- org.apache.axis.attachments,
- org.apache.axis.client,
- org.apache.axis.client.async,
- org.apache.axis.collections,
- org.apache.axis.components.compiler,
- org.apache.axis.components.encoding,
- org.apache.axis.components.image,
- org.apache.axis.components.jms,
- org.apache.axis.components.logger,
- org.apache.axis.components.net,
- org.apache.axis.components.script,
- org.apache.axis.components.threadpool,
- org.apache.axis.components.uuid,
- org.apache.axis.configuration,
- org.apache.axis.constants,
- org.apache.axis.deployment.wsdd,
- org.apache.axis.deployment.wsdd.providers,
- org.apache.axis.description,
- org.apache.axis.encoding,
- org.apache.axis.encoding.ser,
- org.apache.axis.encoding.ser.castor,
- org.apache.axis.handlers,
- org.apache.axis.handlers.http,
- org.apache.axis.handlers.soap,
- org.apache.axis.holders,
- org.apache.axis.i18n,
- org.apache.axis.management,
- org.apache.axis.management.jmx,
- org.apache.axis.message,
- org.apache.axis.monitor,
- org.apache.axis.providers,
- org.apache.axis.providers.java,
- org.apache.axis.schema,
- org.apache.axis.security,
- org.apache.axis.security.servlet,
- org.apache.axis.security.simple,
- org.apache.axis.server,
- org.apache.axis.session,
- org.apache.axis.soap,
- org.apache.axis.strategies,
- org.apache.axis.transport.http,
- org.apache.axis.transport.java,
- org.apache.axis.transport.jms,
- org.apache.axis.transport.local,
- org.apache.axis.transport.mail,
- org.apache.axis.types,
- org.apache.axis.utils,
- org.apache.axis.utils.bytecode,
- org.apache.axis.utils.cache,
- org.apache.axis.wsdl,
- org.apache.axis.wsdl.fromJava,
- org.apache.axis.wsdl.gen,
- org.apache.axis.wsdl.symbolTable,
- org.apache.axis.wsdl.toJava,
- org.apache.xmlbeans,
- org.apache.xmlbeans.impl.common,
- org.apache.xmlbeans.impl.config,
- org.apache.xmlbeans.impl.inst2xsd,
- org.apache.xmlbeans.impl.inst2xsd.util,
- org.apache.xmlbeans.impl.jam,
- org.apache.xmlbeans.impl.jam.annotation,
- org.apache.xmlbeans.impl.jam.internal,
- org.apache.xmlbeans.impl.jam.internal.classrefs,
- org.apache.xmlbeans.impl.jam.internal.elements,
- org.apache.xmlbeans.impl.jam.internal.javadoc,
- org.apache.xmlbeans.impl.jam.internal.parser,
- org.apache.xmlbeans.impl.jam.internal.reflect,
- org.apache.xmlbeans.impl.jam.mutable,
- org.apache.xmlbeans.impl.jam.provider,
- org.apache.xmlbeans.impl.jam.visitor,
- org.apache.xmlbeans.impl.jam.xml,
- org.apache.xmlbeans.impl.regex,
- org.apache.xmlbeans.impl.richParser,
- org.apache.xmlbeans.impl.schema,
- org.apache.xmlbeans.impl.soap,
- org.apache.xmlbeans.impl.store,
- org.apache.xmlbeans.impl.tool,
- org.apache.xmlbeans.impl.util,
- org.apache.xmlbeans.impl.validator,
- org.apache.xmlbeans.impl.values,
- org.apache.xmlbeans.impl.xb.ltgfmt,
- org.apache.xmlbeans.impl.xb.ltgfmt.impl,
- org.apache.xmlbeans.impl.xb.substwsdl,
- org.apache.xmlbeans.impl.xb.substwsdl.impl,
- org.apache.xmlbeans.impl.xb.xmlconfig,
- org.apache.xmlbeans.impl.xb.xmlconfig.impl,
- org.apache.xmlbeans.impl.xb.xmlschema,
- org.apache.xmlbeans.impl.xb.xmlschema.impl,
- org.apache.xmlbeans.impl.xb.xsdownload,
- org.apache.xmlbeans.impl.xb.xsdownload.impl,
- org.apache.xmlbeans.impl.xb.xsdschema,
- org.apache.xmlbeans.impl.xb.xsdschema.impl,
- org.apache.xmlbeans.impl.xpathgen,
- org.apache.xmlbeans.impl.xsd2inst,
- org.apache.xmlbeans.soap,
- org.apache.xmlbeans.xml.stream,
- org.apache.xmlbeans.xml.stream.events,
- org.apache.xmlbeans.xml.stream.utils,
- org.compiere.model,
+ WEB-INF/lib/idempiere-xmlbeans.jar
+Export-Package: org.compiere.model,
  org.idempiere.adInterface.x10,
  org.idempiere.adInterface.x10.impl,
  org.idempiere.adinterface,
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 48beed7783..9592fe3b39 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -6,10 +6,7 @@ bin.includes = META-INF/,\
                WEB-INF/xsd/,\
                plugin.xml,\
                OSGI-INF/,\
-               WEB-INF/lib/aopalliance.jar,\
-               WEB-INF/lib/axis.jar,\
-               WEB-INF/lib/idempiere-xmlbeans.jar,\
-               WEB-INF/lib/xmlbeans.jar
+               WEB-INF/lib/idempiere-xmlbeans.jar
 src.includes = WEB-INF/lib/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index 4ad9a73bb0..75b6307fa0 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -22,46 +22,6 @@
 					</compilerArgs>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>wsdl4j</groupId>
-									<artifactId>wsdl4j</artifactId>
-									<version>1.6.3</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.xmlbeans</groupId>
-									<artifactId>xmlbeans</artifactId>
-									<version>3.0.1</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>aopalliance</groupId>
-									<artifactId>aopalliance</artifactId>
-									<version>1.0</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.apache.axis</groupId>
-									<artifactId>axis</artifactId>
-									<version>1.4</version>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>WEB-INF/lib</outputDirectory>
-							<stripVersion>true</stripVersion>
-							<overWriteReleases>true</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>download-maven-plugin</artifactId>