diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 8a7c21e050..cec13e855f 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -162,20 +162,6 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
-
-
-
+
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index eb0ad845be..d91d1a7343 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -13,8 +13,6 @@
-
-
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index 897e3350f2..bc7457348d 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -13,8 +13,6 @@ Bundle-ClassPath: .,
lib/jasperreports-fonts.jar,
lib/jasperreports-functions.jar,
lib/olap4j.jar,
- lib/spring-beans.jar,
- lib/spring-core.jar,
lib/xmpcore.jar
DynamicImport-Package: *
Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)"
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index 08faa30823..171ad02aa4 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -7,6 +7,4 @@ bin.includes = META-INF/,\
lib/jasperreports-fonts.jar,\
lib/jasperreports-functions.jar,\
lib/olap4j.jar,\
- lib/spring-beans.jar,\
- lib/spring-core.jar,\
lib/xmpcore.jar
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index bac4f7f633..03d3180a94 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -22,13 +22,13 @@
-
+
-
-
+
+
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 3160be873e..c89583bf2f 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -32,8 +32,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\
org.apache.commons.logging,\
org.eclipse.osgi,\
org.eclipse.osgi.services,\
- javax.xml.rpc,\
- javax.xml.soap,\
javax.xml,\
org.apache.activemq.activemq-core,\
org.apache.activemq.kahadb,\
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 9397c8dadc..c601868799 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -260,4 +260,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 3ff99d0a69..e4842e50a2 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 @@
1.7.25
2.3.1
3.2.6
+ 5.1.1.RELEASE
@@ -397,7 +398,7 @@
false
- com.sun.activation:javax.activation:jar:1.2.0
+ javax.activation:javax.activation-api:jar:1.2.0
false
@@ -523,11 +524,36 @@
false
+
+ javax.xml.soap:javax.xml.soap-api:jar:1.4.0
+
+ false
+
+
+ javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1
+
+ false
+
org.codehaus.woodstox:stax2-api:jar:4.1
false
+
+ org.springframework:spring-beans:jar:${spring.version}
+
+ false
+
+
+ org.springframework:spring-core:jar:${spring.version}
+
+ false
+
+
+ org.springframework:spring-jcl:jar:${spring.version}
+
+ false
+