diff --git a/org.adempiere.payment.processor/pom.xml b/org.adempiere.payment.processor/pom.xml
index 4922742ad8..2501a0acde 100644
--- a/org.adempiere.payment.processor/pom.xml
+++ b/org.adempiere.payment.processor/pom.xml
@@ -22,7 +22,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/jpayment.jar</url>
+							<url>${url.file.srv}/extra.jar/jpayment.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -35,7 +35,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/Verisign.jar</url>
+							<url>${url.file.srv}/extra.jar/Verisign.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -48,7 +48,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/payflow.jar</url>
+							<url>${url.file.srv}/extra.jar/payflow.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml
index c37b210c63..ba1d29df53 100644
--- a/org.adempiere.report.jasper.library/pom.xml
+++ b/org.adempiere.report.jasper.library/pom.xml
@@ -78,7 +78,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/jp-${jp.version}/jasperreports-fonts-${jp.version}.jar</url>
+							<url>${url.file.srv}/extra.jar/jasperreports-fonts-${jp.version}.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<outputFileName>jasperreports-fonts.jar</outputFileName>
diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml
index 312b721fdb..c116c4aa66 100644
--- a/org.adempiere.server-feature/pom.xml
+++ b/org.adempiere.server-feature/pom.xml
@@ -184,7 +184,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/101-20121212164242.zip</url>
+							<url>${url.file.srv}/extra.jar/101-20121212164242.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
@@ -197,7 +197,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/21-20121212154702.zip</url>
+							<url>${url.file.srv}/extra.jar/21-20121212154702.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
@@ -210,7 +210,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/6-20121212124109.zip</url>
+							<url>${url.file.srv}/extra.jar/6-20121212124109.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>../fitnesse/FitNesseRoot/FitLibraryWeb</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.ui.swing/pom.xml b/org.adempiere.ui.swing/pom.xml
index 179214d205..55c30a1bb5 100644
--- a/org.adempiere.ui.swing/pom.xml
+++ b/org.adempiere.ui.swing/pom.xml
@@ -69,7 +69,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/jpedal.jar</url>
+							<url>${url.file.srv}/extra.jar/jpedal.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.adempiere.ui.zk/pom.xml b/org.adempiere.ui.zk/pom.xml
index 14bdd8f936..7f8d43b194 100644
--- a/org.adempiere.ui.zk/pom.xml
+++ b/org.adempiere.ui.zk/pom.xml
@@ -51,7 +51,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/labelapplet.jar</url>
+							<url>${url.file.srv}/extra.jar/labelapplet.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>./</outputDirectory>
 							<retries>5</retries>
diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml
index f8a67adca3..9b881e3a9a 100644
--- a/org.compiere.db.oracle.provider/pom.xml
+++ b/org.compiere.db.oracle.provider/pom.xml
@@ -58,7 +58,7 @@
 						</goals>
 						<configuration>
 							<!-- to complicate to get from official repository https://blogs.oracle.com/dev2dev/get-oracle-jdbc-drivers-from-the-oracle-maven-repo-netbeans-eclipse-intellij -->
-							<url>${url.file.srv}/jarfile/6.1/ojdbc7.jar</url>
+							<url>${url.file.srv}/extra.jar/ojdbc7.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.idempiere.fitnesse.server/pom.xml b/org.idempiere.fitnesse.server/pom.xml
index 4eb108a452..3dbc4a9114 100644
--- a/org.idempiere.fitnesse.server/pom.xml
+++ b/org.idempiere.fitnesse.server/pom.xml
@@ -63,7 +63,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/fitlibrary-2.0.jar</url>
+							<url>${url.file.srv}/extra.jar/fitlibrary-2.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
@@ -77,7 +77,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/fitlibraryweb-2.0.jar</url>
+							<url>${url.file.srv}/extra.jar/fitlibraryweb-2.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>lib</outputDirectory>
 							<retries>5</retries>
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b7e6cd38bd..25e55c4ce3 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -764,6 +764,14 @@
 		<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"/>
@@ -792,82 +800,12 @@
 		<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="https://sourceforge.net/projects/idempiere/files/binary.file/jarfile/maven-p2-R20181031"/>
-		<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"/>
@@ -924,6 +862,8 @@
 		<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"/>
@@ -940,6 +880,10 @@
 		<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"/>
@@ -950,10 +894,32 @@
 		<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"/>
@@ -1012,8 +978,30 @@
 		<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.spring-aop" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
+		<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_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"/>
@@ -1027,6 +1015,7 @@
 		<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.xmlbeans" version="3.0.1"/>
+		<unit id="org.apache.xmlgraphics" version="2.2.0.v20180410-1551"/>
 		<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"/>
@@ -1045,36 +1034,47 @@
 		<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"/>
 		<unit id="org.passay" version="1.3.1"/>
 		<unit id="org.passay.source" version="1.3.1"/>
+		<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.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="org.apache.servicemix.bundles.spring-beans" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-context" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-core" version="4.3.19.RELEASE_1"/>
+		<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="org.apache.servicemix.bundles.spring-beans.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-context.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-core.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-aop" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-aop.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-context-support" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-context-support.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-expression" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-expression.source.sources" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-web" version="4.3.19.RELEASE_1"/>
-		<unit id="org.apache.servicemix.bundles.spring-web.source.sources" version="4.3.19.RELEASE_1"/>
-		<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="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://raw.githubusercontent.com/idempiere/binary.file/master/p2.maven/maven-p2-R20181031"/>
 	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10"/>
-</target>
+</target>
\ No newline at end of file
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index d59b3a8290..95cb60652c 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -30,7 +30,7 @@
 		<idempiere-equinox-repository-id>eclipse-photon-201809</idempiere-equinox-repository-id>
 		<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository</idempiere-orbit-url>
 		<idempiere-orbit-repository-id>orbit-photon-R20180905201904</idempiere-orbit-repository-id>
-		<url.file.srv>http://downloads.sourceforge.net/project/idempiere/binary.file</url.file.srv>
+		<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
 		<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
 		<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
 		<codehaus.plexus>2.8.5</codehaus.plexus>
diff --git a/org.idempiere.webservices/pom.xml b/org.idempiere.webservices/pom.xml
index 7a032db849..c84b1cc962 100644
--- a/org.idempiere.webservices/pom.xml
+++ b/org.idempiere.webservices/pom.xml
@@ -32,7 +32,7 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>${url.file.srv}/jarfile/6.1/idempiere-xmlbeans-1.0.jar</url>
+							<url>${url.file.srv}/extra.jar/idempiere-xmlbeans-1.0.jar</url>
 							<unpack>false</unpack>
 							<outputDirectory>WEB-INF/lib</outputDirectory>
 							<retries>5</retries>