Bug 470352 - [aeri] network connection test code accidentally points to
non-eclipse.org URL
diff --git a/XWT.b3aggrcon b/XWT.b3aggrcon
index 8f6e0e5..f8ced35 100644
--- a/XWT.b3aggrcon
+++ b/XWT.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="XWT - Declarative UI in XML for Eclipse" label="XWT">
-  <repositories location="http://download.eclipse.org/xwt/release-1.1.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features description="XWT Runtime" name="org.eclipse.xwt.feature.feature.group" versionRange="1.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
diff --git a/actf.b3aggrcon b/actf.b3aggrcon
index 751dec0..a8eb29c 100644
--- a/actf.b3aggrcon
+++ b/actf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ACTF">
-  <repositories location="http://download.eclipse.org/technology/actf/1.3/update-site/" description="ACTF 1.3">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="ACTF 1.3">
     <features name="org.eclipse.actf.visualization.sdk.feature.group" versionRange="[1.3.0.R201506071315]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/amalgam.b3aggrcon b/amalgam.b3aggrcon
index 6a3edea..41ee30a 100644
--- a/amalgam.b3aggrcon
+++ b/amalgam.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Amalgam">
-  <repositories location="http://download.eclipse.org/modeling/amalgam/updates/milestones/1.6RC1" description="Amalgam Stable Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Amalgam Stable Milestones">
     <features name="org.eclipse.amalgam.discovery.feature.group" versionRange="[1.4.0,2.0.0]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/birt.b3aggrcon b/birt.b3aggrcon
index 3f40310..3129537 100644
--- a/birt.b3aggrcon
+++ b/birt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="BIRT">
-  <repositories location="http://download.eclipse.org/birt/update-site/mars-interim/" description="BIRT interim">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="BIRT interim">
     <features name="org.eclipse.birt.feature.group" versionRange="4.5.0.v201506092134">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Business%20Intelligence%2C%20Reporting%20and%20Charting']"/>
     </features>
diff --git a/cdt.b3aggrcon b/cdt.b3aggrcon
index 0103e15..b077afd 100644
--- a/cdt.b3aggrcon
+++ b/cdt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="CDT">
-  <repositories location="http://download.eclipse.org/tools/cdt/builds/mars/milestones" description="CDT updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="CDT updates">
     <bundles name="org.eclipse.cdt.core.aix" versionRange="5.1.0.201106081058"/>
     <bundles name="org.eclipse.cdt.core.linux" versionRange="5.2.0.201106081058"/>
     <bundles name="org.eclipse.cdt.core.linux.ppc64" versionRange="5.1.0.201106081058"/>
@@ -66,7 +66,7 @@
     </features>
     <features name="org.eclipse.cdt.debug.standalone.feature.group" versionRange="1.0.0.201405061918"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/cdt/launchbar/mars" description="LaunchBar Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="LaunchBar Updates">
     <features name="org.eclipse.launchbar.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/dltk.b3aggrcon b/dltk.b3aggrcon
index 51de9f9..e3da10c 100644
--- a/dltk.b3aggrcon
+++ b/dltk.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="DLTK">
-  <repositories location="http://download.eclipse.org/technology/dltk/updates-dev/5.2/" description="DLTK 5.2">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="DLTK 5.2">
     <features name="org.eclipse.dltk.core.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/dtp.b3aggrcon b/dtp.b3aggrcon
index 5e1eb61..754ccc6 100644
--- a/dtp.b3aggrcon
+++ b/dtp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="DataTools">
-  <repositories location="http://download.eclipse.org/datatools/downloads/drops/M_updates_1.12.0" description="DTP 1.12.0 Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="DTP 1.12.0 Updates">
     <features name="org.eclipse.datatools.sdk.feature.feature.group" versionRange="1.12.0.v201406061321-7PB21FEpPZQXdcX0z-_yMM0Hfz0w">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Database%20Development']"/>
     </features>
diff --git a/ecf.b3aggrcon b/ecf.b3aggrcon
index 14c22d2..d6ecd64 100644
--- a/ecf.b3aggrcon
+++ b/ecf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ECF">
-  <repositories location="http://download.eclipse.org/rt/ecf/3.10.0/site.p2" description="ECF updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="ECF updates">
     <features name="org.eclipse.ecf.core.feature.group" versionRange="3.10.0.v20150512-1727">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/ecp.b3aggrcon b/ecp.b3aggrcon
index adf04d1..a165955 100644
--- a/ecp.b3aggrcon
+++ b/ecp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="ECP">
-  <repositories location="http://download.eclipse.org/ecp/rt/160_2" description="ECP 1.6.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="ECP 1.6.0">
     <features name="org.eclipse.emf.ecp.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/efxclipse.b3aggrcon b/efxclipse.b3aggrcon
index 02fd605..b2ba2c2 100644
--- a/efxclipse.b3aggrcon
+++ b/efxclipse.b3aggrcon
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="e(fx)clipse - JavaFX Tooling and Runtime" label="e(fx)clipse">
-  <repositories location="http://download.eclipse.org/efxclipse/simrel-contrib/mars/rc4/shared/site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.fx.runtime.min.feature.feature.group"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/efxclipse/simrel-contrib/mars/rc4/tools/site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.fx.ide.feature.feature.group" />
   </repositories>
   <contacts href="simrel.b3aggr#//@contacts[email='tom.schindl@bestsolution.at']"/>
diff --git a/egit.b3aggrcon b/egit.b3aggrcon
index ea95670..0578119 100644
--- a/egit.b3aggrcon
+++ b/egit.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EGit">
-  <repositories location="http://download.eclipse.org/egit/updates-4.0" description="EGit Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EGit Updates">
     <features name="org.eclipse.jgit.feature.group" versionRange="[4.0.0.201506090130-r]"/>
     <features name="org.eclipse.jgit.pgm.feature.group" versionRange="[4.0.0.201506090130-r]"/>
     <features name="org.eclipse.egit.feature.group" versionRange="[4.0.0.201506090130-r]">
@@ -17,7 +17,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/egit/github/updates-4.0" description="EGit GitHub Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EGit GitHub Updates">
     <features name="org.eclipse.mylyn.github.feature.feature.group" versionRange="[4.0.0.201506090130-r]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/emf-cdo.b3aggrcon b/emf-cdo.b3aggrcon
index 3108eb7..0b3d3a6 100644
--- a/emf-cdo.b3aggrcon
+++ b/emf-cdo.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF CDO">
-  <repositories location="http://download.eclipse.org/modeling/emf/cdo/drops/R20150610-1526" description="EMF CDO R20150610-1526">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF CDO R20150610-1526">
     <features name="org.eclipse.net4j.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-compare.b3aggrcon b/emf-compare.b3aggrcon
index 4d2671d..c7a683c 100644
--- a/emf-compare.b3aggrcon
+++ b/emf-compare.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF COMPARE">
-  <repositories location="http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201506080833">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.emf.compare.feature.group" versionRange="[3.1.0,3.2.0)"/>
     <features name="org.eclipse.emf.compare.source.feature.group" versionRange="[3.1.0,3.2.0)"/>
     <features name="org.eclipse.emf.compare.ide.ui.feature.group" versionRange="[3.1.0,3.2.0)">
diff --git a/emf-diffmerge.b3aggrcon b/emf-diffmerge.b3aggrcon
index 4fae258..cc36754 100644
--- a/emf-diffmerge.b3aggrcon
+++ b/emf-diffmerge.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Diff/Merge">
-  <repositories location="http://download.eclipse.org/diffmerge/updates/mars/official" description="EMF Diff/Merge Releases">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF Diff/Merge Releases">
     <features name="org.eclipse.emf.diffmerge.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-emf-rap.b3aggrcon b/emf-emf-rap.b3aggrcon
index e37e202..8209699 100644
--- a/emf-emf-rap.b3aggrcon
+++ b/emf-emf-rap.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF RAP(Runtime)">
-  <repositories location="http://download.eclipse.org/modeling/emf/emf/updates/milestones" description="EMF (Core) 2.11">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF (Core) 2.11">
     <features name="org.eclipse.emf.rap.sdk.feature.group" versionRange="[2.11.0.v20150601-0402]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/emf-emf.b3aggrcon b/emf-emf.b3aggrcon
index 1e2bccc..04d5fb8 100644
--- a/emf-emf.b3aggrcon
+++ b/emf-emf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF (Core)">
-  <repositories location="http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/" description="EMF (Core) 2.11">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF (Core) 2.11">
     <features name="org.eclipse.emf.sdk.feature.group" versionRange="[2.11.0.v20150601-0402]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/emf-query.b3aggrcon b/emf-query.b3aggrcon
index 41883a1..c16c43f 100644
--- a/emf-query.b3aggrcon
+++ b/emf-query.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Query">
-  <repositories location="http://download.eclipse.org/modeling/emf/query/updates/milestones/S201505312221" description="EMF Query milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF Query milestones">
     <features name="org.eclipse.emf.query.sdk.feature.group" versionRange="[1.9.0.201505312221]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-transaction.b3aggrcon b/emf-transaction.b3aggrcon
index ee61b46..8a802b3 100644
--- a/emf-transaction.b3aggrcon
+++ b/emf-transaction.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Transaction">
-  <repositories location="http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201506010221" description="EMF Transaction milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF Transaction milestones">
     <features name="org.eclipse.emf.transaction.sdk.feature.group" versionRange="[1.9.0.201506010221]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emf-validation.b3aggrcon b/emf-validation.b3aggrcon
index 8628b89..56336bf 100644
--- a/emf-validation.b3aggrcon
+++ b/emf-validation.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Validation">
-  <repositories location="http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201505312255" description="EMF Validation milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF Validation milestones">
     <features name="org.eclipse.emf.validation.sdk.feature.group" versionRange="[1.9.0.201505312255]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emfstore.b3aggrcon b/emfstore.b3aggrcon
index f58b955..a44d58e 100644
--- a/emfstore.b3aggrcon
+++ b/emfstore.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFStore">
-  <repositories location="http://download.eclipse.org/emfstore/rt/150" description="EMFStore 1.5.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMFStore 1.5.0">
     <features name="org.eclipse.emf.emfstore.sdk.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-ecoretools.b3aggrcon b/emft-ecoretools.b3aggrcon
index 340566f..da7e28e 100644
--- a/emft-ecoretools.b3aggrcon
+++ b/emft-ecoretools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFT Ecore Tools">
-  <repositories location="http://download.eclipse.org/ecoretools/updates/milestones/3.0.0RC2/luna" description="EMFT Ecore Tools Releases">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMFT Ecore Tools Releases">
     <features name="org.eclipse.emf.ecoretools.sdk.feature.group" versionRange="[3.0.0,4.0.0]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-eef.b3aggrcon b/emft-eef.b3aggrcon
index 3383ec6..13f1db9 100644
--- a/emft-eef.b3aggrcon
+++ b/emft-eef.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Extended Editing Framework (EEF)">
-  <repositories location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201505291308/">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.emf.eef.sdk-feature.feature.group" versionRange="[1.5.0,1.6.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-egf.b3aggrcon b/emft-egf.b3aggrcon
index f120303..c0c406c 100644
--- a/emft-egf.b3aggrcon
+++ b/emft-egf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF EGF">
-  <repositories location="http://download.eclipse.org/egf/updates/mars/official" description="EMF EGF Releases">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF EGF Releases">
     <features name="org.eclipse.egf.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-emffacet.b3aggrcon b/emft-emffacet.b3aggrcon
index adf4dfb..61d036f 100644
--- a/emft-emffacet.b3aggrcon
+++ b/emft-emffacet.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMF Facet">
-  <repositories location="http://download.eclipse.org/facet/updates/integration/1.0.0/I201505181340/" description="EMF Facet">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMF Facet">
     <features name="org.eclipse.emf.facet.sdk.feature.feature.group" versionRange="1.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/emft-mwe.b3aggrcon b/emft-mwe.b3aggrcon
index 0bd0634..ac0fe2a 100644
--- a/emft-mwe.b3aggrcon
+++ b/emft-mwe.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EMFT MWE">
-  <repositories location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.0/R201505260335/mwe" description="EMFT MWE p2 repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMFT MWE p2 repository">
     <features name="org.eclipse.emf.mwe2.runtime.sdk.feature.group" versionRange="2.8.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
@@ -8,7 +8,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.8.0/R201505260456/mwe2lang/" description="EMFT MWE lang p2 repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EMFT MWE lang p2 repository">
     <features name="org.eclipse.emf.mwe2.language.sdk.feature.group" versionRange="2.8.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/ep.b3aggrcon b/ep.b3aggrcon
index da69d9f..0236375 100644
--- a/ep.b3aggrcon
+++ b/ep.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Eclipse">
-  <repositories location="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5RC4-201506032000/" description="Eclipse and Equinox">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Eclipse and Equinox">
     <products name="org.eclipse.sdk.ide"/>
     <products name="org.eclipse.platform.ide"/>
     <products name="org.eclipse.platform.sdk"/>
diff --git a/epp-mpc.b3aggrcon b/epp-mpc.b3aggrcon
index 79bc9fb..8c451c4 100644
--- a/epp-mpc.b3aggrcon
+++ b/epp-mpc.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="EPP Marketplace Client">
-  <repositories location="http://download.eclipse.org/mpc/drops/1.4.0/v20150609-1527" description="EPP Marketplace Client">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="EPP Marketplace Client">
     <features name="org.eclipse.epp.mpc.feature.group" versionRange="[1.4.0,1.4.1)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/equinox.b3aggrcon b/equinox.b3aggrcon
index 86c4a6a..a09ab9e 100644
--- a/equinox.b3aggrcon
+++ b/equinox.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Equinox">
-  <repositories location="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5RC4-201506032000/" description="Eclipse and Equinox">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Eclipse and Equinox">
     <products name="org.eclipse.rcp.sdk.id"/>
     <features name="org.eclipse.equinox.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
diff --git a/gef.b3aggrcon b/gef.b3aggrcon
index b662e61..b125fc7 100644
--- a/gef.b3aggrcon
+++ b/gef.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GEF">
-  <repositories location="http://download.eclipse.org/tools/gef/updates/milestones" description="GEF milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="GEF milestones">
     <features name="org.eclipse.gef.sdk.feature.group" versionRange="[3.10.0.201506010206]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
@@ -11,7 +11,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/gef/gef4/updates/milestones" description="GEF4 milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="GEF4 milestones">
     <features name="org.eclipse.gef4.common.sdk.feature.group" versionRange="[0.1.0.201506081138]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/gmf-tooling.b3aggrcon b/gmf-tooling.b3aggrcon
index bd0528a..45f9873 100644
--- a/gmf-tooling.b3aggrcon
+++ b/gmf-tooling.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Tooling">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500" description="GMF Tooling repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="GMF Tooling repository">
     <features name="org.eclipse.gmf.tooling.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-gmf-notation.b3aggrcon b/gmp-gmf-notation.b3aggrcon
index 0945936..1f4217e 100644
--- a/gmp-gmf-notation.b3aggrcon
+++ b/gmp-gmf-notation.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Notation">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201505312221" description="GMF Notation milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="GMF Notation milestones">
     <features name="org.eclipse.gmf.runtime.notation.sdk.feature.group" versionRange="[1.9.0.201505312221]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-gmf-runtime.b3aggrcon b/gmp-gmf-runtime.b3aggrcon
index 97ab4d5..34a77d1 100644
--- a/gmp-gmf-runtime.b3aggrcon
+++ b/gmp-gmf-runtime.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="GMF Runtime">
-  <repositories location="http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201506060219" description="GMF Runtime milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="GMF Runtime milestones">
     <features name="org.eclipse.gmf.feature.group" versionRange="[1.9.0.201506060219]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gmp-graphiti.b3aggrcon b/gmp-graphiti.b3aggrcon
index c6b5aef..4ed244f 100644
--- a/gmp-graphiti.b3aggrcon
+++ b/gmp-graphiti.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="The Eclipse Modeling Graphiti project" label="Graphiti">
-  <repositories location="http://download.eclipse.org/graphiti/updates/milestones/S-0.12.0RC3-201506030807/" description="Graphiti Milestones Update Site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Graphiti Milestones Update Site">
     <features description="The feature containing the Graphiti framework" name="org.eclipse.graphiti.feature.feature.group" versionRange="[0.12.0,0.13.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/gyrex.b3aggrcon b/gyrex.b3aggrcon
index 5cd0136..863ac85 100644
--- a/gyrex.b3aggrcon
+++ b/gyrex.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="The Eclipse Gyrex Project" label="Gyrex">
-  <repositories location="http://download.eclipse.org/gyrex/1.5/milestones/" description="Gyrex 1.5 Milestone Builds">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Gyrex 1.5 Milestone Builds">
     <features description="Gyrex Target Components" name="org.eclipse.gyrex.features.sdk.withoutdeps.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/jubula.b3aggrcon b/jubula.b3aggrcon
index 1e0b719..9d8469b 100644
--- a/jubula.b3aggrcon
+++ b/jubula.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Jubula">
-  <repositories location="http://download.eclipse.org/jubula/release/mars">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.jubula.feature.feature.group" versionRange="3.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/jwt.b3aggrcon b/jwt.b3aggrcon
index 087e7c3..c1f1f30 100644
--- a/jwt.b3aggrcon
+++ b/jwt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Java Workflow Tooling">
-  <repositories location="http://download.eclipse.org/jwt/update-site-luna/" description="JWT releases">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="JWT releases">
     <features name="org.eclipse.jwt.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/ldt.b3aggrcon b/ldt.b3aggrcon
index 3f48dc7..d957723 100644
--- a/ldt.b3aggrcon
+++ b/ldt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="LDT">
-  <repositories location="http://download.eclipse.org/ldt/releases/milestones/1.3RC4" description="LDT updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="LDT updates">
     <features name="org.eclipse.ldt.feature.group" versionRange="1.3.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/linuxtools.b3aggrcon b/linuxtools.b3aggrcon
index 0e95acb..bc31005 100644
--- a/linuxtools.b3aggrcon
+++ b/linuxtools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Linux Tools">
-  <repositories location="http://download.eclipse.org/linuxtools/update-mars-rc4" description="Linux Tools Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Linux Tools Updates">
     <features name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group" versionRange="4.0.0.201506101754">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Linux%20Tools']"/>
     </features>
@@ -54,7 +54,7 @@
     <features name="org.eclipse.linuxtools.dataviewers.feature.feature.group" versionRange="4.0.0.201506101754"/>
     <features name="org.eclipse.linuxtools.dataviewers.feature.source.feature.group" versionRange="4.0.0.201506101754"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/linuxtools/update-mars-docker-rc4" description="Linux Tools Docker Support Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Linux Tools Docker Support Updates">
     <features name="org.eclipse.linuxtools.docker.feature.feature.group" versionRange="1.0.0.201506101754">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/m2e-wtp.b3aggrcon b/m2e-wtp.b3aggrcon
index d64d98b..77b7322 100644
--- a/m2e-wtp.b3aggrcon
+++ b/m2e-wtp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="m2e-wtp" label="m2e-wtp">
-  <repositories location="http://download.eclipse.org/m2e-wtp/milestones/mars/1.2.0/1.2.0.20150602-1740" description="m2e-wtp Mars M build repo">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="m2e-wtp Mars M build repo">
     <features name="org.eclipse.m2e.wtp.feature.feature.group" versionRange="1.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/m2e.b3aggrcon b/m2e.b3aggrcon
index 13a5f53..d2840f5 100644
--- a/m2e.b3aggrcon
+++ b/m2e.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="m2e" label="m2e">
-  <repositories location="http://download.eclipse.org/technology/m2e/milestones/1.6/" description="m2e 1.6.x milestones repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="m2e 1.6.x milestones repository">
     <features name="org.eclipse.m2e.feature.feature.group" versionRange="1.6.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/m2m-atl.b3aggrcon b/m2m-atl.b3aggrcon
index 9e3a41e..a33193c 100644
--- a/m2m-atl.b3aggrcon
+++ b/m2m-atl.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2M ATL">
-  <repositories location="http://download.eclipse.org/mmt/atl/updates/milestones/3.6/" description="M2M ATL milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="M2M ATL milestones">
     <features name="org.eclipse.m2m.atl.sdk.feature.group" versionRange="3.6.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/m2t-acceleo.b3aggrcon b/m2t-acceleo.b3aggrcon
index b845fc8..1c89019 100644
--- a/m2t-acceleo.b3aggrcon
+++ b/m2t-acceleo.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2T ACCELEO">
-  <repositories location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201506080954" description="M2T ACCELEO">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="M2T ACCELEO">
     <features name="org.eclipse.acceleo.feature.group" versionRange="[3.6.0,3.7.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/m2t-xpand.b3aggrcon b/m2t-xpand.b3aggrcon
index d788648..832502b 100644
--- a/m2t-xpand.b3aggrcon
+++ b/m2t-xpand.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="M2T Xpand">
-  <repositories location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201505260349/" description="M2T XPAND p2 repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="M2T XPAND p2 repository">
     <features name="org.eclipse.xpand.sdk.feature.group" versionRange="2.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mat.b3aggrcon b/mat.b3aggrcon
index 2a02ca7..09ed04a 100644
--- a/mat.b3aggrcon
+++ b/mat.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Memory Analyzer (MAT)">
-  <repositories location="http://download.eclipse.org/mat/mars/RC2/update-site/" description="Memory Analyzer Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Memory Analyzer Updates">
     <features name="org.eclipse.mat.feature.feature.group" versionRange="1.5.0.201505271423">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Performance%2C%20Profiling%20and%20Tracing%20Tools']"/>
     </features>
diff --git a/mdt-bpmn2.b3aggrcon b/mdt-bpmn2.b3aggrcon
index 9c1c791..4506c22 100644
--- a/mdt-bpmn2.b3aggrcon
+++ b/mdt-bpmn2.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT BPMN2">
-  <repositories location="http://download.eclipse.org/modeling/mdt/bpmn2/updates/mars/1.2.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.bpmn2.feature.feature.group" versionRange="1.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/mdt-modisco.b3aggrcon b/mdt-modisco.b3aggrcon
index bc05774..ab64737 100644
--- a/mdt-modisco.b3aggrcon
+++ b/mdt-modisco.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MoDisco">
-  <repositories location="http://download.eclipse.org/modeling/mdt/modisco/updates/integration/0.13.0/I201505191058/" description="MoDisco Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="MoDisco Milestones">
     <features name="org.eclipse.modisco.sdk.feature.feature.group" versionRange="0.13.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mdt-ocl.b3aggrcon b/mdt-ocl.b3aggrcon
index 6812f8e..d832371 100644
--- a/mdt-ocl.b3aggrcon
+++ b/mdt-ocl.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT OCL 6.0">
-  <repositories location="http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.0.0/S201506090403" description="Eclipse OCL 6.0.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Eclipse OCL 6.0.0">
     <features name="org.eclipse.ocl.all.sdk.feature.group" versionRange="[5.1.0,5.2.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/mdt-papyrus.b3aggrcon b/mdt-papyrus.b3aggrcon
index 504afa8..843d3ee 100644
--- a/mdt-papyrus.b3aggrcon
+++ b/mdt-papyrus.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Contribution of the Modeling MDT Papyrus project" label="Papyrus">
-  <repositories location="http://download.eclipse.org/modeling/mdt/papyrus/updates/milestones/1.1/RC4/main" description="Papyrus">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Papyrus">
     <features description="Papyrus SDK Feature" name="org.eclipse.papyrus.sdk.feature.feature.group" versionRange="1.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mdt-uml2.b3aggrcon b/mdt-uml2.b3aggrcon
index f12045a..580e674 100644
--- a/mdt-uml2.b3aggrcon
+++ b/mdt-uml2.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="MDT UML2">
-  <repositories location="http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones" description="UML2 5.1 Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="UML2 5.1 Milestones">
     <features name="org.eclipse.uml2.sdk.feature.group" versionRange="[5.1.0.v20150601-0733]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mmt-qvto.b3aggrcon b/mmt-qvto.b3aggrcon
index 6012455..54d532a 100644
--- a/mmt-qvto.b3aggrcon
+++ b/mmt-qvto.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="QVT Operational">
-  <repositories location="http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201506031058" description="QVT Operational 3.5.0 milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="QVT Operational 3.5.0 milestones">
     <features name="org.eclipse.m2m.qvt.oml.sdk.feature.group" versionRange="[3.5.0,3.6.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/mylyn.b3aggrcon b/mylyn.b3aggrcon
index e4f4291..b6b592a 100644
--- a/mylyn.b3aggrcon
+++ b/mylyn.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Mylyn">
-  <repositories location="http://download.eclipse.org/mylyn/snapshots/3.16" description="Mylyn for Eclipse Mars">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Mylyn for Eclipse Mars">
     <features name="org.eclipse.mylyn_feature.feature.group" versionRange="3.16.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/objectteams.b3aggrcon b/objectteams.b3aggrcon
index 09b95c6..865bce2 100644
--- a/objectteams.b3aggrcon
+++ b/objectteams.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Object Teams">
-  <repositories location="http://download.eclipse.org/objectteams/updates/ot2.4-staging">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features description="Object Teams Development Tooling" name="org.eclipse.objectteams.otdt.feature.group" versionRange="2.4.0.201506091308">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/oomph.b3aggrcon b/oomph.b3aggrcon
index 78d4d98..2f6692d 100644
--- a/oomph.b3aggrcon
+++ b/oomph.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Oomph">
-  <repositories location="http://download.eclipse.org/oomph/drops/milestone/S20150610-124713-1.1.0-RC4" description="Oomph Mars RC4">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Oomph Mars RC4">
     <features name="org.eclipse.oomph.setup.sdk.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/pdt.b3aggrcon b/pdt.b3aggrcon
index e799945..c364d1a 100644
--- a/pdt.b3aggrcon
+++ b/pdt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="PDT">
-  <repositories location="http://download.eclipse.org/tools/pdt/updates/3.5-rc4" description="PDT 3.5">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="PDT 3.5">
     <features name="org.eclipse.php.feature.group" versionRange="3.5.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
diff --git a/ptp.b3aggrcon b/ptp.b3aggrcon
index ab00783..f09fc88 100644
--- a/ptp.b3aggrcon
+++ b/ptp.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="PTP">
-  <repositories location="http://download.eclipse.org/tools/ptp/builds/mars/milestones/RC4" description="PTP updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="PTP updates">
     <features name="org.eclipse.ptp.feature.group" versionRange="9.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
@@ -35,7 +35,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones/RC4" description="Remote Services">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Remote Services">
     <features name="org.eclipse.remote.feature.group" versionRange="2.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
diff --git a/qvtd.b3aggrcon b/qvtd.b3aggrcon
index d5af4a3..4aeb691 100644
--- a/qvtd.b3aggrcon
+++ b/qvtd.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="QVT Declarative">
-  <repositories location="http://download.eclipse.org/mmt/qvtd/updates/milestones/0.12.0/S201506090524" description="QVT Declarative 1.0.0 milestones (incubation)">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="QVT Declarative 1.0.0 milestones (incubation)">
     <features name="org.eclipse.qvtd.master.feature.group" versionRange="[0.12.0,1.0.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/rap-tools.b3aggrcon b/rap-tools.b3aggrcon
index 88e2540..e728c0a 100644
--- a/rap-tools.b3aggrcon
+++ b/rap-tools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RAP Tools">
-  <repositories location="http://download.eclipse.org/rt/rap/tools/3.0/RC4-20150609-1348/" description="RAP 3.0 Tools Repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="RAP 3.0 Tools Repository">
     <features name="org.eclipse.rap.tools.feature.feature.group" versionRange="[3.0.0,3.1.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/rap.b3aggrcon b/rap.b3aggrcon
index 540e72b..337dd48 100644
--- a/rap.b3aggrcon
+++ b/rap.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RAP Runtime">
-  <repositories location="http://download.eclipse.org/rt/rap/3.0/RC4-20150602-0950/" description="RAP 3.0 Runtime Repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="RAP 3.0 Runtime Repository">
     <features name="org.eclipse.rap.feature.feature.group" versionRange="[3.0.0,3.1.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/rcptt.b3aggrcon b/rcptt.b3aggrcon
index 0d49024..18be6ff 100644
--- a/rcptt.b3aggrcon
+++ b/rcptt.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="RCPTT">
-  <repositories location="http://download.eclipse.org/rcptt/milestone/2.0.0/RC4/repository/">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.rcptt.platform.feature.group" versionRange="2.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/recommenders.b3aggrcon b/recommenders.b3aggrcon
index c87840b..0697db3 100644
--- a/recommenders.b3aggrcon
+++ b/recommenders.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Code Recommenders">
-  <repositories location="http://download.eclipse.org/recommenders/updates/simrel/mars/2015-06-09_16-58-29">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.recommenders.rcp.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Programming%20Languages']"/>
     </features>
diff --git a/riena.b3aggrcon b/riena.b3aggrcon
index 8141ab1..f8f66b0 100644
--- a/riena.b3aggrcon
+++ b/riena.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Riena">
-  <repositories location="http://download.eclipse.org/rt/riena/6.1.0.RC1/e4-rap/" description="Riena Target Components (E4/RAP)">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Riena Target Components (E4/RAP)">
     <features name="org.eclipse.riena.build.feature.sdk.e4.feature.group" versionRange="6.1.0.v20150520_6_1_0_RC1">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/sapphire.b3aggrcon b/sapphire.b3aggrcon
index 239c43c..232eb68 100644
--- a/sapphire.b3aggrcon
+++ b/sapphire.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Sapphire" label="Sapphire">
-  <repositories location="http://download.eclipse.org/sapphire/9/repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.sapphire.feature.group" versionRange="[9.0.0.201506110922]">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/scout-rap.b3aggrcon b/scout-rap.b3aggrcon
index 98481e6..c2be816 100644
--- a/scout-rap.b3aggrcon
+++ b/scout-rap.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Scout Business Application Development" label="Scout RAP Runtime">
-  <repositories location="http://download.eclipse.org/scout/releases/5.0/5.0.0/scout.rap/RC4-20150610-0810" description="Scout RAP Targets">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Scout RAP Targets">
     <features description="Eclipse Scout SDK RAP" name="org.eclipse.scout.rt.rap.source.feature.group" versionRange="4.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='EclipseRT%20Target%20Platform%20Components']"/>
     </features>
diff --git a/scout.b3aggrcon b/scout.b3aggrcon
index ebe6898..0f7fbbf 100644
--- a/scout.b3aggrcon
+++ b/scout.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Scout Business Application Development" label="Scout">
-  <repositories location="http://download.eclipse.org/scout/releases/5.0/5.0.0/scout.main/RC4-20150610-0810" description="Scout Targets">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Scout Targets">
     <features description="Eclipse Scout" name="org.eclipse.scout.feature.group" versionRange="4.0.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Application%20Development%20Frameworks']"/>
     </features>
diff --git a/sirius.b3aggrcon b/sirius.b3aggrcon
index 6cc6b95..12f46ae 100644
--- a/sirius.b3aggrcon
+++ b/sirius.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Eclipse Sirius" label="Sirius">
-  <repositories location="http://download.eclipse.org/sirius/updates/releases/3.0.0/mars">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.sirius.specifier.feature.group" versionRange="[3.0.0,3.1.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
     </features>
diff --git a/soa-bpel.b3aggrcon b/soa-bpel.b3aggrcon
index 4ba81f4..9831bf9 100644
--- a/soa-bpel.b3aggrcon
+++ b/soa-bpel.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SOA-BPEL">
-  <repositories location="http://download.eclipse.org/bpel/site/1.0.4">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.bpel.common.feature.feature.group" versionRange="1.0.4">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/soa-bpmn2-modeler.b3aggrcon b/soa-bpmn2-modeler.b3aggrcon
index 1e4991e..a4464b1 100644
--- a/soa-bpmn2-modeler.b3aggrcon
+++ b/soa-bpmn2-modeler.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SOA-BPMN2 Modeler">
-  <repositories location="http://download.eclipse.org/bpmn2-modeler/updates/mars/1.2.0">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.bpmn2.modeler.feature.group" versionRange="1.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/sphinx.b3aggrcon b/sphinx.b3aggrcon
index 9a6c5ab..ac96438 100644
--- a/sphinx.b3aggrcon
+++ b/sphinx.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Sphinx (Incubation)" label="Sphinx">
-  <repositories location="http://download.eclipse.org/sphinx/updates/interim">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.sphinx.sdk.feature.group" versionRange="0.9.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
diff --git a/stardust.b3aggrcon b/stardust.b3aggrcon
index 5d8f669..cc63efa 100644
--- a/stardust.b3aggrcon
+++ b/stardust.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Stardust allows you to model business processes in Eclipse, integrate them with your application services and UI components, run them in the Process Engine and access workflow functionality and document management capabilities in the Browser Portal. " label="Stardust">
-  <repositories location="http://download.eclipse.org/stardust/milestones/mars">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.stardust.documentation.documentation-feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='SOA%20Development']"/>
     </features>
diff --git a/subversive.b3aggrcon b/subversive.b3aggrcon
index c1976f4..a53ec56 100644
--- a/subversive.b3aggrcon
+++ b/subversive.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Subversive">
-  <repositories location="http://download.eclipse.org/technology/subversive/3.0/mars-site/" description="Subversive for Eclipse Mars">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Subversive for Eclipse Mars">
     <features name="org.eclipse.team.svn.feature.group" versionRange="[3.0.0,4.0.0)">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Collaboration']"/>
     </features>
diff --git a/swtbot.b3aggrcon b/swtbot.b3aggrcon
index 308a5eb..4c252fe 100644
--- a/swtbot.b3aggrcon
+++ b/swtbot.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="SWTBot">
-  <repositories location="http://download.eclipse.org/technology/swtbot/snapshots">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.swtbot.ide.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Testing']"/>
     </features>
diff --git a/tcf.b3aggrcon b/tcf.b3aggrcon
index bf5490a..2833170 100644
--- a/tcf.b3aggrcon
+++ b/tcf.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="TCF">
-  <repositories location="http://download.eclipse.org/tools/tcf/builds/1.3/milestones/rc4" description="TCF 1.3 Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="TCF 1.3 Milestones">
     <features name="org.eclipse.tcf.cdt.feature.feature.group" versionRange="1.3.1.201505051438">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
     </features>
diff --git a/thym.b3aggrcon b/thym.b3aggrcon
index 05187e1..0efe785 100644
--- a/thym.b3aggrcon
+++ b/thym.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="THyM">
-  <repositories location="http://download.eclipse.org/thym/snapshots/" description="THyM : The Hybrid Mobile">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="THyM : The Hybrid Mobile">
     <features name="org.eclipse.thym.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
     </features>
diff --git a/tm.b3aggrcon b/tm.b3aggrcon
index 42e524b..4c5e6fb 100644
--- a/tm.b3aggrcon
+++ b/tm.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="TM">
-  <repositories location="http://download.eclipse.org/tm/updates/4.0milestones" description="TM 4.0 Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="TM 4.0 Milestones">
     <features name="org.eclipse.rse.feature.group" versionRange="3.7.0.201505221634">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
@@ -10,7 +10,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/tm/terminal/builds/4.0/milestones/rc4" description="TM Terminal 4.0 Milestones">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="TM Terminal 4.0 Milestones">
     <features name="org.eclipse.tm.terminal.feature.feature.group" versionRange="4.0.0.201506040306">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Mobile%20and%20Device%20Development']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/tmf-xtext.b3aggrcon b/tmf-xtext.b3aggrcon
index 741955f..0ba24e7 100644
--- a/tmf-xtext.b3aggrcon
+++ b/tmf-xtext.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="Xtext, Xtend">
-  <repositories location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.8.3/" description="Xtext p2 repository">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Xtext p2 repository">
     <features name="org.eclipse.xtext.sdk.feature.group" versionRange="2.8.3">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Modeling']"/>
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
diff --git a/tracecompass.b3aggrcon b/tracecompass.b3aggrcon
index 0459445..ab33c29 100644
--- a/tracecompass.b3aggrcon
+++ b/tracecompass.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Trace Compass Updates" label="Trace Compass">
-  <repositories location="http://download.eclipse.org/tracecompass/mars/milestones" description="Trace Compass Updates">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Trace Compass Updates">
     <features name="org.eclipse.tracecompass.lttng2.control.feature.group" versionRange="0.1.0"/>
     <features name="org.eclipse.tracecompass.lttng2.kernel.feature.group" versionRange="0.1.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Performance%2C%20Profiling%20and%20Tracing%20Tools']"/>
diff --git a/webtools.b3aggrcon b/webtools.b3aggrcon
index 4ce3ff5..ca135b0 100644
--- a/webtools.b3aggrcon
+++ b/webtools.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" label="WebTools">
-  <repositories location="http://download.eclipse.org/webtools/downloads/drops/R3.7.0/R-3.7.0-20150609111814/repository/" description="Web Tools 3.7 repository site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Web Tools 3.7 repository site">
     <features name="org.eclipse.wst.web_ui.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
@@ -85,7 +85,7 @@
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
   </repositories>
-  <repositories location="http://download.eclipse.org/webtools/downloads/drops/C3.2.0/I-C3.2.0-20100614204142/repository/" description="Web Tools 3.2 capability site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Web Tools 3.2 capability site">
     <bundles name="org.eclipse.wtp.epp.package.capabilities" versionRange="1.3.0.v201005102000"/>
     <bundles name="org.eclipse.wtp.epp.package.jee.intro" versionRange="1.3.0.v201005102030"/>
     <bundles name="org.eclipse.wtp.javascript.capabilities" versionRange="1.0.100.v201005102000"/>
@@ -93,7 +93,7 @@
     <bundles name="org.eclipse.wtp.web.capabilities" versionRange="1.0.100.v201005102000"/>
     <bundles name="org.eclipse.wtp.xml.capabilities" versionRange="1.0.100.v201005102000"/>
   </repositories>
-  <repositories location="http://download.eclipse.org/libra/milestones/S-0.3.1RC1-201405141436" description="Libra 0.3.1 RC1 repository site">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/" description="Libra 0.3.1 RC1 repository site">
     <features name="org.eclipse.libra.facet.feature.feature.group">
       <categories href="simrel.b3aggr#//@customCategories[identifier='Web%2C%20XML%2C%20Java%20EE%20and%20OSGi%20Enterprise%20Development']"/>
     </features>
diff --git a/windowbuilder.b3aggrcon b/windowbuilder.b3aggrcon
index 44cac99..1f5b76d 100644
--- a/windowbuilder.b3aggrcon
+++ b/windowbuilder.b3aggrcon
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ASCII"?>
 <aggregator:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:aggregator="http://www.eclipse.org/b3/2011/aggregator/1.1.0" description="Window Builder GUI Designer" label="Window Builder">
-  <repositories location="http://download.eclipse.org/windowbuilder/WB/release/R201506241200-1/4.5">
+  <repositories location="http://download.eclipse.org/releases/mars/201506241000/">
     <features name="org.eclipse.wb.core.feature.feature.group" versionRange="1.2.0">
       <categories href="simrel.b3aggr#//@customCategories[identifier='General%20Purpose%20Tools']"/>
     </features>