diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index cec13e855f..433433c94d 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -364,13 +364,6 @@
version="0.0.0"
unpack="false"/>
-
-
+
+
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index ad01cce8a2..b31b58fc95 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -24,7 +24,7 @@
-
+
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index 096f719ed0..0d13bf78aa 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -53,16 +53,6 @@
olap4j
0.9.7.309-JS-3
-
- org.springframework
- spring-beans
- 2.5
-
-
- org.springframework
- spring-core
- 2.5
-
com.adobe.xmp
xmpcore
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 03d3180a94..f9cd3f424e 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.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index c89583bf2f..20b8a93d82 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -55,7 +55,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.passay,\
groovy,\
org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\
- com.sun.activation.javax.activation,\
jaxb-api,\
org.eclipse.osgi@start
osgi.framework.extensions=
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index c601868799..c5631882ec 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -295,4 +295,39 @@
version="0.0.0"
unpack="false"/>
+
+
+
+
+
+
+
+
+
+
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 e4842e50a2..735b870892 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,7 +28,6 @@
1.7.25
2.3.1
3.2.6
- 5.1.1.RELEASE
@@ -398,7 +397,8 @@
false
- javax.activation:javax.activation-api:jar:1.2.0
+
+ com.sun.activation:javax.activation:jar:1.2.0
false
@@ -540,17 +540,37 @@
false
- org.springframework:spring-beans:jar:${spring.version}
+ org.springframework:spring-beans:jar:${springframework.version}
false
- org.springframework:spring-core:jar:${spring.version}
+ org.springframework:spring-core:jar:${springframework.version}
false
- org.springframework:spring-jcl:jar:${spring.version}
+ org.springframework:spring-jcl:jar:${springframework.version}
+
+ false
+
+
+ org.springframework:spring-context:jar:${springframework.version}
+
+ false
+
+
+ org.springframework:spring-expression:jar:${springframework.version}
+
+ false
+
+
+ org.springframework:spring-aop:jar:${springframework.version}
+
+ false
+
+
+ org.springframework:spring-web:jar:${springframework.version}
false
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index a23bcae523..6464478a4c 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -806,6 +806,8 @@
+
+
@@ -856,6 +858,8 @@
+
+
@@ -866,6 +870,10 @@
+
+
+
+
@@ -993,6 +1001,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1001,7 +1023,9 @@
+
+
@@ -1020,23 +1044,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 3adf9f1c2c..beecf3b2e8 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -79,17 +79,18 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
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"
+ 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"
Bundle-ClassPath: .,
WEB-INF/lib/aopalliance.jar,
WEB-INF/lib/axis.jar,
WEB-INF/lib/idempiere-xmlbeans.jar,
- WEB-INF/lib/spring-aop.jar,
- WEB-INF/lib/spring-beans.jar,
- WEB-INF/lib/spring-context.jar,
- WEB-INF/lib/spring-core.jar,
- WEB-INF/lib/spring-expression.jar,
- WEB-INF/lib/spring-web.jar,
WEB-INF/lib/xmlbeans.jar
Export-Package: org.apache.axis,
org.apache.axis.attachments,
@@ -196,9 +197,7 @@ Export-Package: org.apache.axis,
org.idempiere.adinterface,
org.idempiere.webservices,
org.idempiere.webservices.client,
- org.idempiere.webservices.fault,
- org.springframework.web.context,
- org.springframework.web.util
+ org.idempiere.webservices.fault
Web-ContextPath: ADInterface
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.idempiere.webservices
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 68fda8309a..48beed7783 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -9,12 +9,6 @@ bin.includes = META-INF/,\
WEB-INF/lib/aopalliance.jar,\
WEB-INF/lib/axis.jar,\
WEB-INF/lib/idempiere-xmlbeans.jar,\
- WEB-INF/lib/spring-aop.jar,\
- WEB-INF/lib/spring-beans.jar,\
- WEB-INF/lib/spring-context.jar,\
- WEB-INF/lib/spring-core.jar,\
- WEB-INF/lib/spring-expression.jar,\
- WEB-INF/lib/spring-web.jar,\
WEB-INF/lib/xmlbeans.jar
src.includes = WEB-INF/lib/,\
WEB-INF/web.xml,\
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index d376cab1a6..ff6fa3c4d1 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -23,36 +23,6 @@
-
- org.springframework
- spring-aop
- ${springframework.version}
-
-
- org.springframework
- spring-web
- ${springframework.version}
-
-
- org.springframework
- spring-context
- ${springframework.version}
-
-
- org.springframework
- spring-beans
- ${springframework.version}
-
-
- org.springframework
- spring-core
- ${springframework.version}
-
-
- org.springframework
- spring-expression
- ${springframework.version}
-
wsdl4j
wsdl4j