diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index c64f70d933..3908e78e97 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -260,27 +260,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.springframework.spring-beans"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.springframework.spring-core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.springframework.spring-jcl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="javax.xml.soap-api"
          download-size="0"
@@ -295,34 +274,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.springframework.spring-aop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.springframework.spring-context"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.springframework.spring-expression"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.springframework.spring-web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.sun.activation.javax.activation"
          download-size="0"
@@ -337,4 +288,81 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.springframework.aop"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.beans"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.expression"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.osgi.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.osgi.extender"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.osgi.io"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.web"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.aopalliance"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.asm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.springframework.context"
+         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 3442e05432..bb33ce8758 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
@@ -28,6 +28,7 @@
         <slf4j.version>1.7.25</slf4j.version>
 		<xml.ws.version>2.3.1</xml.ws.version>
 		<apache.cxf.version>3.2.6</apache.cxf.version>
+		<spring.osgi.version>1.2.1</spring.osgi.version>
 	</properties>
 	
     <repositories>
@@ -550,16 +551,22 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
-										<artifact>
+<!--										<artifact>
 											<id>org.springframework:spring-jcl:jar:${springframework.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+-->
 										<artifact>
 											<id>org.springframework:spring-context:jar:${springframework.version}</id>
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.springframework:spring-asm:jar:${springframework.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 										<artifact>
 											<id>org.springframework:spring-expression:jar:${springframework.version}</id>
 											<source>true</source>
@@ -575,6 +582,21 @@
 											<source>true</source>
 											<transitive>false</transitive>
 										</artifact>
+										<artifact>
+											<id>org.springframework.osgi:spring-osgi-extender:jar:${spring.osgi.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.springframework.osgi:spring-osgi-core:jar:${spring.osgi.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
+										<artifact>
+											<id>org.springframework.osgi:spring-osgi-io:jar:${spring.osgi.version}</id>
+											<source>true</source>
+											<transitive>false</transitive>
+										</artifact>
 									</artifacts>
 								</feature>
 								<!-- zk public zk osgi on zip format download from sourceforge, so 
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index 31193d8b4a..05a1a5ea71 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181012" sequenceNumber="107">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="idempiere-181029" sequenceNumber="107">
 <locations>
 <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.restlet.example.feature.group" version="2.3.2.v20150501-1520"/>
@@ -1001,20 +1001,22 @@
 		<unit id="org.mortbay.jasper.apache-jsp" version="8.5.33"/>
 		<unit id="org.passay" version="1.3.1"/>
 		<unit id="org.passay.source" version="1.3.1"/>
-		<unit id="org.springframework.spring-aop" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-aop.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-beans" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-beans.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-context" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-context.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-core" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-core.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-expression" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-expression.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-jcl" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-jcl.source" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-web" version="5.1.1.RELEASE"/>
-		<unit id="org.springframework.spring-web.source" version="5.1.1.RELEASE"/>
+		<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.beans" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.beans.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"/>
+		<unit id="org.springframework.expression.source" version="3.1.4.RELEASE"/>
+		<unit id="org.springframework.osgi.core" version="1.2.1"/>
+		<unit id="org.springframework.osgi.core.source" version="1.2.1"/>
+		<unit id="org.springframework.osgi.extender" version="1.2.1"/>
+		<unit id="org.springframework.osgi.extender.source" version="1.2.1"/>
+		<unit id="org.springframework.osgi.io" version="1.2.1"/>
+		<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"/>
@@ -1045,6 +1047,12 @@
 		<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.parent/pom.xml b/org.idempiere.parent/pom.xml
index 47aac53fc4..5f61fb708a 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -20,7 +20,7 @@
 		<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>
-		<springframework.version>5.1.1.RELEASE</springframework.version>
+		<springframework.version>3.1.4.RELEASE</springframework.version>
 		<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
 		<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
 		<netbeans.lib.version>RELEASE731</netbeans.lib.version>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 0f23ee8501..7e7aca32d8 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -6,7 +6,9 @@ Bundle-Version: 5.1.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
 Service-Component: OSGI-INF/ws_modelfactory.xml
-Import-Package: javax.mail;version="1.4.1",
+Import-Package: javax.activation,
+ javax.annotation,
+ javax.mail;version="1.4.1",
  javax.mail.internet;version="1.5",
  javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
@@ -75,18 +77,20 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6",
  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.spring-aop;bundle-version="5.1.1",
- org.springframework.spring-beans;bundle-version="5.1.1",
- org.springframework.spring-context;bundle-version="5.1.1",
- org.springframework.spring-core;bundle-version="5.1.1",
- org.springframework.spring-expression;bundle-version="5.1.1",
- org.springframework.spring-jcl;bundle-version="5.1.1",
- org.springframework.spring-web;bundle-version="5.1.1",
- javax.annotation-api;bundle-version="1.3.2",
- com.sun.activation.javax.activation;bundle-version="1.2.0",
- javax.xml.ws;bundle-version="2.1.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",
+ org.springframework.expression;bundle-version="3.1.4",
+ org.springframework.osgi.core;bundle-version="1.2.1",
+ org.springframework.osgi.extender;bundle-version="1.2.1",
+ org.springframework.osgi.io;bundle-version="1.2.1",
+ 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"
 Bundle-ClassPath: .,
  WEB-INF/lib/aopalliance.jar,
  WEB-INF/lib/axis.jar,