[Releng] Use a variable for the Eclipse Download Server, to improve

performances when building on the Eclipse build server

- The download server is now represented with a variable in the parent
POM, so we can access it either via HTTP or filesystem. It could also be
used to access a specific mirror
- The Dependencies Updater script has been updated accordingly
- The Dependenncies Updater script has been fixed to properly update
POMs (Regression introduced by the previous change)

Change-Id: I5f3df38a8fcbba1a3c706ee3a48e6eee6e367d73
Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>

4 files changed, 276 insertions, 273 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
index 03b57af11ce..5acb4b02d11 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/handler/UpdateDependenciesHandler.java
@@ -10,7 +10,7 @@
  *     Camille Letavernier (CEA LIST) - camille.letavernier@cea.fr - Generalize to handle POMs

  *     Christian W. Damus (CEA) - Add support for updating Oomph setup models

  *     Christian W. Damus - Support updating of multiple selected files

- *     

+ *

  *******************************************************************************/

 package org.eclipse.papyrus.releng.tools.internal.handler;

 

@@ -18,6 +18,7 @@ import java.lang.reflect.Modifier;
 import java.net.URL;

 import java.util.ArrayList;

 import java.util.Enumeration;

+import java.util.LinkedList;

 import java.util.List;

 import java.util.Map;

 

@@ -201,8 +202,8 @@ public class UpdateDependenciesHandler extends AbstractHandler {
 	protected boolean updateFile(IFile selectedFile, Aggregation aggregationModel, Shell activeShell, Map<Object, Object> context) throws CoreException {

 		boolean result = false;

 

-		DependencyUpdater updater = findDependencyUpdater(selectedFile);

-		if (updater != null) {

+		List<DependencyUpdater> updaters = findDependencyUpdater(selectedFile);

+		for (DependencyUpdater updater : updaters) {

 			updater.updateDocument(activeShell, selectedFile, aggregationModel.getAllContributions(true), context);

 			result = true;

 		}

@@ -210,9 +211,9 @@ public class UpdateDependenciesHandler extends AbstractHandler {
 		return result;

 	}

 

-	protected DependencyUpdater findDependencyUpdater(IFile mapFile) throws CoreException {

+	protected List<DependencyUpdater> findDependencyUpdater(IFile mapFile) throws CoreException {

 		final String path = "org/eclipse/papyrus/releng/tools/internal/popup/actions/"; //$NON-NLS-1$

-		DependencyUpdater result = null;

+

 		Bundle bundle = Activator.getDefault().getBundle();

 

 		// Try dev mode, first

@@ -222,6 +223,8 @@ public class UpdateDependenciesHandler extends AbstractHandler {
 			urls = bundle.findEntries(path, "*.class", false);

 		}

 

+		List<DependencyUpdater> updaters = new LinkedList<>();

+

 		while (urls.hasMoreElements()) {

 			URL classURL = urls.nextElement();

 			URI classURI = URI.createURI(classURL.toExternalForm(), true);

@@ -233,8 +236,7 @@ public class UpdateDependenciesHandler extends AbstractHandler {
 					if (!Modifier.isAbstract(updaterClass.getModifiers())) {

 						DependencyUpdater updater = updaterClass.newInstance();

 						if (updater.canUpdate(mapFile)) {

-							result = updater;

-							break;

+							updaters.add(updater);

 						}

 					}

 				}

@@ -245,6 +247,6 @@ public class UpdateDependenciesHandler extends AbstractHandler {
 			}

 		}

 

-		return result;

+		return updaters;

 	}

 }

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
index 94fdc097862..ba3efab8074 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomPropertiesUpdater.java
@@ -12,13 +12,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.releng.tools.internal.popup.actions;

 

-import java.util.Map;

-

-import org.eclipse.b3.aggregator.Contribution;

 import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.swt.widgets.Shell;

 import org.w3c.dom.Node;

 

 

@@ -45,6 +39,9 @@ public class PomPropertiesUpdater extends DependencyUpdater {
 

 	@Override

 	protected void updateUri(Node uri, String location) {

+		if (location.startsWith("http://download.eclipse.org")) {

+			location = location.replace("http://download.eclipse.org", "${eclipse.download}");

+		}

 		uri.setTextContent(location);

 	}

 

diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
index 1880d3406c8..9dc7940558f 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/src/org/eclipse/papyrus/releng/tools/internal/popup/actions/PomUpdater.java
@@ -39,6 +39,9 @@ public class PomUpdater extends DependencyUpdater {
 

 	@Override

 	protected void updateUri(Node uri, String location) {

+		if (location.startsWith("http://download.eclipse.org")) {

+			location = location.replace("http://download.eclipse.org", "${eclipse.download}");

+		}

 		uri.setTextContent(location);

 	}

 

diff --git a/releng/pom.xml b/releng/pom.xml
index 9ef4ca1c6f0..9f8111a9b82 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -1,265 +1,266 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.all.releng</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<properties>
-		<tycho-version>0.23.1</tycho-version>
-		<tychoExtrasVersion>0.23.1</tychoExtrasVersion>
-		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>
-		<jarSignerVersion>1.1.2</jarSignerVersion>
-		<findbugs.version>3.0.1</findbugs.version>
-		<xtext.version>2.7.3</xtext.version>
-		<java.source.version>1.7</java.source.version>
-		<java.target.version>1.7</java.target.version>
-		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>
-		<skipAllTests>false</skipAllTests>
-		<skipInnerTests>true</skipInnerTests>
-
-		<!-- manualUpdate -->
-		<nattable.repo.url>http://download.eclipse.org/nattable/releases/1.3.0/repository/</nattable.repo.url>
-
-		<!-- manualUpdate -->
-		<nebula-tablecombo.repo.url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</nebula-tablecombo.repo.url>
-
-		<!-- manualUpdate -->
-		<orbit.repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository</orbit.repo.url>
-
-		<!-- updateFrom("Extended Editing Framework (EEF)",0) -->
-		<eef.repo.url>http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201505291308/</eef.repo.url>
-
-		<!-- manualUpdate -->
-		<rmf.repo.url>http://download.eclipse.org/rmf/updates/releases</rmf.repo.url>
-
-		<!-- manualUpdate -->
-		<papyrusrt.repo.url>http://download.eclipse.org/papyrus-rt/updates/releases/mars/0.7.0/</papyrusrt.repo.url>
-
-		<!-- manualUpdate -->
-		<swtbot.repo.url>http://download.eclipse.org/technology/swtbot/snapshots</swtbot.repo.url>
-		
-		<!-- updateFrom("CDT",0) -->
-		<cdt.repo.url>http://download.eclipse.org/tools/cdt/builds/neon/milestones</cdt.repo.url>
-		
-		<!-- updateFrom("EMF CDO",0) -->
-		<emf-cdo.repo.url>http://download.eclipse.org/modeling/emf/cdo/drops/S20150819-1258</emf-cdo.repo.url>
-		
-		<!-- updateFrom("EMF COMPARE",0) -->
-		<emf-compare.repo.url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.2/S201511010417</emf-compare.repo.url>
-		
-		<!-- updateFrom("EMF Query",0) -->
-		<emf-query.repo.url>http://download.eclipse.org/modeling/emf/query/updates/releases/R201505312221</emf-query.repo.url>
-		
-		<!-- updateFrom("M2T ACCELEO",0) -->
-		<m2t-acceleo.repo.url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201510300615</m2t-acceleo.repo.url>
-		
-		<!-- manualUpdate -->
-		<upr.repo.url>http://download.eclipse.org/upr/0.9RC1/update/</upr.repo.url>
-		
-		<!-- manualUpdate -->
-		<b3.repo.url>http://download.eclipse.org/modeling/emft/b3/updates-4.4</b3.repo.url>
-		
-		<!-- updateFrom("Mylyn",0) -->
-		<mylyn.repo.url>http://download.eclipse.org/mylyn/snapshots/3.18</mylyn.repo.url>
-		
-		<!-- updateFrom("EGIT",0) -->
-		<egit.repo.url>http://download.eclipse.org/egit/updates-4.1</egit.repo.url>
-		
-		<!-- updateFrom("EPP Logging",0) -->
-		<epp-logging.repo.url>http://download.eclipse.org/technology/epp/logging/milestones/</epp-logging.repo.url>
-		
-		<!-- updateFrom("oomph",0) -->
-		<oomph.repo.url>http://download.eclipse.org/oomph/drops/release/1.2.1</oomph.repo.url>
-
-		<!-- Papyrus repositories -->
-		<papyrus.eclipse.target>neon</papyrus.eclipse.target>
-		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
-		<papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>
-
-	</properties>
-
-	<modules>
-		<module>main</module>
-		<module>extra</module>
-		<module>dev</module>
-		<module>main-tests</module>
-		<module>extra-tests</module>
-	</modules>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>org.eclipse.cbi.maven.plugins</id>
-			<name>Eclipse CBI</name>
-			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>eclipse.org-mylyn</id>
-			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->
-			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<repositories>
-		<repository>
-			<id>emf-emf</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF (Core)",0) -->
-			<url>http://download.eclipse.org/modeling/emf/emf/updates/2.12milestones/</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[0]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",0) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201509290600/mwe</url>
-		</repository>
-		<repository>
-			<id>emft-mwe[1]</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMFT MWE",1) -->
-			<url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201509290840/mwe2lang/</url>
-		</repository>
-		<repository>
-			<id>emf-transaction</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF TRANSACTION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/transaction/updates/releases/R201506010221</url>
-		</repository>
-		<repository>
-			<id>emf-validation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("EMF VALIDATION",0) -->
-			<url>http://download.eclipse.org/modeling/emf/validation/updates/releases/R201505312255</url>
-		</repository>
-		<repository>
-			<id>ep</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Eclipse",0) -->
-			<url>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6M2-201509162000/</url>
-		</repository>
-		<repository>
-			<id>gef</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GEF",0) -->
-			<url>http://download.eclipse.org/tools/gef/updates/milestones</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-notation</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Notation",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R201505312221</url>
-		</repository>
-		<repository>
-			<id>gmp-gmf-runtime</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Runtime",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R201506060219</url>
-		</repository>
-		<repository>
-			<id>gmf-tooling</id>
-			<layout>p2</layout>
-			<!-- updateFrom("GMF Tooling",0) -->
-			<url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>
-		</repository>
-		<repository>
-			<id>m2t-xpand</id>
-			<layout>p2</layout>
-			<!-- updateFrom("M2T XPAND",0) -->
-			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201509290912/</url>
-		</repository>
-		<repository>
-			<id>mdt-ocl</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT OCL 6.0",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.1.0/S201509281333</url>
-		</repository>
-		<repository>
-			<id>mdt-uml2</id>
-			<layout>p2</layout>
-			<!-- updateFrom("MDT UML2",0) -->
-			<url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1</url>
-		</repository>
-		<repository>
-			<id>mmt-qvto</id>
-			<layout>p2</layout>
-			<!-- updateFrom("QVT Operational",0) -->
-			<url>http://download.eclipse.org/mmt/qvto/updates/releases/3.5.0</url>
-		</repository>
-		<repository>
-			<id>nattable</id>
-			<layout>p2</layout>
-			<!-- manualUpdate -->
-			<url>${nattable.repo.url}</url>
-		</repository>
-		
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<project>

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>org.eclipse.papyrus</groupId>

+	<artifactId>org.eclipse.papyrus.all.releng</artifactId>

+	<version>1.2.0-SNAPSHOT</version>

+	<packaging>pom</packaging>

+

+	<properties>

+		<tycho-version>0.23.1</tycho-version>

+		<tychoExtrasVersion>0.23.1</tychoExtrasVersion>

+		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus</tycho.scmUrl>

+		<jarSignerVersion>1.1.2</jarSignerVersion>

+		<findbugs.version>3.0.1</findbugs.version>

+		<xtext.version>2.7.3</xtext.version>

+		<java.source.version>1.7</java.source.version>

+		<java.target.version>1.7</java.target.version>

+		<mylyn.wikitext.version>2.4.0-SNAPSHOT</mylyn.wikitext.version>

+		<skipAllTests>false</skipAllTests>

+		<skipInnerTests>true</skipInnerTests>

+		<eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Set to file:/home/data/httpd/download.eclipse.org when building on Eclipse servers to improve performances -->

+

+		<!-- manualUpdate -->

+		<nattable.repo.url>${eclipse.download}/nattable/releases/1.3.0/repository/</nattable.repo.url>

+

+		<!-- manualUpdate -->

+		<nebula-tablecombo.repo.url>${eclipse.download}/technology/nebula/archives/Q12015/release/</nebula-tablecombo.repo.url>

+

+		<!-- manualUpdate -->

+		<orbit.repo.url>${eclipse.download}/tools/orbit/downloads/drops/R20150519210750/repository</orbit.repo.url>

+

+		<!-- updateFrom("Extended Editing Framework (EEF)",0) -->

+		<eef.repo.url>${eclipse.download}/modeling/emft/eef/updates/milestones/1.5/S201505291308/</eef.repo.url>

+

+		<!-- manualUpdate -->

+		<rmf.repo.url>${eclipse.download}/rmf/updates/releases</rmf.repo.url>

+

+		<!-- manualUpdate -->

+		<papyrusrt.repo.url>${eclipse.download}/papyrus-rt/updates/releases/mars/0.7.0/</papyrusrt.repo.url>

+

+		<!-- manualUpdate -->

+		<swtbot.repo.url>${eclipse.download}/technology/swtbot/snapshots</swtbot.repo.url>

+		

+		<!-- updateFrom("CDT",0) -->

+		<cdt.repo.url>${eclipse.download}/tools/cdt/builds/neon/milestones</cdt.repo.url>

+		

+		<!-- updateFrom("EMF CDO",0) -->

+		<emf-cdo.repo.url>${eclipse.download}/modeling/emf/cdo/drops/R20150916-0434</emf-cdo.repo.url>

+		

+		<!-- updateFrom("EMF COMPARE",0) -->

+		<emf-compare.repo.url>${eclipse.download}/modeling/emf/compare/updates/milestones/3.2/S201511010417</emf-compare.repo.url>

+		

+		<!-- updateFrom("EMF Query",0) -->

+		<emf-query.repo.url>${eclipse.download}/modeling/emf/query/updates/releases/R201505312221</emf-query.repo.url>

+		

+		<!-- updateFrom("M2T ACCELEO",0) -->

+		<m2t-acceleo.repo.url>${eclipse.download}/acceleo/updates/milestones/3.6/S201510300615</m2t-acceleo.repo.url>

+		

+		<!-- manualUpdate -->

+		<upr.repo.url>${eclipse.download}/upr/0.9RC1/update/</upr.repo.url>

+		

+		<!-- manualUpdate -->

+		<b3.repo.url>${eclipse.download}/modeling/emft/b3/updates-4.4</b3.repo.url>

+		

+		<!-- updateFrom("Mylyn",0) -->

+		<mylyn.repo.url>${eclipse.download}/mylyn/snapshots/3.18</mylyn.repo.url>

+		

+		<!-- updateFrom("EGIT",0) -->

+		<egit.repo.url>${eclipse.download}/egit/staging/v4.2.0.201511101648-m1</egit.repo.url>

+		

+		<!-- updateFrom("EPP Logging",0) -->

+		<epp-logging.repo.url>${eclipse.download}/technology/epp/logging/milestones/</epp-logging.repo.url>

+		

+		<!-- updateFrom("oomph",0) -->

+		<oomph.repo.url>${eclipse.download}/oomph/drops/release/1.2.1</oomph.repo.url>

+

+		<!-- Papyrus repositories -->

+		<papyrus.eclipse.target>neon</papyrus.eclipse.target>

+		<papyrus.repo.main>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>

+		<papyrus.repo.extra>${eclipse.download}/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}/extra</papyrus.repo.extra>

+

+	</properties>

+

+	<modules>

+		<module>main</module>

+		<module>extra</module>

+		<module>dev</module>

+		<module>main-tests</module>

+		<module>extra-tests</module>

+	</modules>

+

+	<pluginRepositories>

+		<pluginRepository>

+			<id>org.eclipse.cbi.maven.plugins</id>

+			<name>Eclipse CBI</name>

+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>

+			<releases>

+				<enabled>true</enabled>

+			</releases>

+			<snapshots>

+				<enabled>false</enabled>

+			</snapshots>

+		</pluginRepository>

+		<pluginRepository>

+			<id>eclipse.org-mylyn</id>

+			<!-- url>https://repo.eclipse.org/content/repositories/mylyn-releases/</url -->

+			<url>https://repo.eclipse.org/content/repositories/mylyn/</url>

+		</pluginRepository>

+	</pluginRepositories>

+

+	<repositories>

+		<repository>

+			<id>emf-emf</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF (Core)",0) -->

+			<url>${eclipse.download}/modeling/emf/emf/updates/2.12milestones/</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[0]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",0) -->

+			<url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201511100512/mwe</url>

+		</repository>

+		<repository>

+			<id>emft-mwe[1]</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMFT MWE",1) -->

+			<url>${eclipse.download}/modeling/emft/mwe/updates/milestones/S201511100907/mwe2lang/</url>

+		</repository>

+		<repository>

+			<id>emf-transaction</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF TRANSACTION",0) -->

+			<url>${eclipse.download}/modeling/emf/transaction/updates/releases/R201506010221</url>

+		</repository>

+		<repository>

+			<id>emf-validation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("EMF VALIDATION",0) -->

+			<url>${eclipse.download}/modeling/emf/validation/updates/releases/R201505312255</url>

+		</repository>

+		<repository>

+			<id>ep</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Eclipse",0) -->

+			<url>${eclipse.download}/eclipse/updates/4.6milestones/S-4.6M3-201510291100/</url>

+		</repository>

+		<repository>

+			<id>gef</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GEF",0) -->

+			<url>${eclipse.download}/tools/gef/updates/milestones</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-notation</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Notation",0) -->

+			<url>${eclipse.download}/modeling/gmp/gmf-notation/updates/releases/R201505312221</url>

+		</repository>

+		<repository>

+			<id>gmp-gmf-runtime</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Runtime",0) -->

+			<url>${eclipse.download}/modeling/gmp/gmf-runtime/updates/releases/R201506060219</url>

+		</repository>

+		<repository>

+			<id>gmf-tooling</id>

+			<layout>p2</layout>

+			<!-- updateFrom("GMF Tooling",0) -->

+			<url>${eclipse.download}/modeling/gmp/gmf-tooling/updates/milestones-3.3/S201506090500</url>

+		</repository>

+		<repository>

+			<id>m2t-xpand</id>

+			<layout>p2</layout>

+			<!-- updateFrom("M2T XPAND",0) -->

+			<url>${eclipse.download}/modeling/m2t/xpand/updates/milestones/S201509290912/</url>

+		</repository>

+		<repository>

+			<id>mdt-ocl</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT OCL 6.0",0) -->

+			<url>${eclipse.download}/modeling/mdt/ocl/updates/milestones/6.1.0/S201511091515</url>

+		</repository>

+		<repository>

+			<id>mdt-uml2</id>

+			<layout>p2</layout>

+			<!-- updateFrom("MDT UML2",0) -->

+			<url>${eclipse.download}/modeling/mdt/uml2/updates/5.2milestones</url>

+		</repository>

+		<repository>

+			<id>mmt-qvto</id>

+			<layout>p2</layout>

+			<!-- updateFrom("QVT Operational",0) -->

+			<url>${eclipse.download}/mmt/qvto/updates/milestones/3.6.0/S201511100603</url>

+		</repository>

+		<repository>

+			<id>nattable</id>

+			<layout>p2</layout>

+			<!-- manualUpdate -->

+			<url>${nattable.repo.url}</url>

+		</repository>

+		

 		<!-- Bug 468668: Reinstate and update this when the TableCombo has a new release for Mars or later.
         <repository>
             <id>nebula-tablecombo</id>
             <layout>p2</layout>
             <url>http://download.eclipse.org/technology/nebula/archives/Q12015/release/</url>
         </repository>
-        -->
-        
-		<repository>
-			<id>orbit</id>
-			<layout>p2</layout>
-			<!-- manualUpdate -->
-			<url>${orbit.repo.url}</url>
-		</repository>
-		<repository>
-			<id>tmf-xtext</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Xtext, Xtend",0) -->
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/I201509281643/</url>
-		</repository>
-		<repository>
-			<id>webtools</id>
-			<layout>p2</layout>
-			<!-- updateFrom("WebTools",0) -->
-			<url>http://download.eclipse.org/webtools/downloads/drops/R3.8.0/S-3.8.0M1-20150818010140/repository/</url>
-		</repository>
-		<repository>
-			<id>XWT</id>
-			<layout>p2</layout>
-			<!-- updateFrom("XWT",0) -->
-			<url>http://download.eclipse.org/xwt/release-1.1.0</url>
-		</repository>
-		<repository>
-			<id>subversive</id>
-			<layout>p2</layout>
-			<!-- updateFrom("Subversive",0) -->
-			<url>http://download.eclipse.org/technology/subversive/3.0/neon-site/</url>
-		</repository>
-	</repositories>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
-					<configuration>
-						<encoding>UTF-8</encoding>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-				<plugin>
-					<groupId>org.eclipse.xtend</groupId>
-					<artifactId>xtend-maven-plugin</artifactId>
-					<version>${xtext.version}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
+        -->

+        

+		<repository>

+			<id>orbit</id>

+			<layout>p2</layout>

+			<!-- manualUpdate -->

+			<url>${orbit.repo.url}</url>

+		</repository>

+		<repository>

+			<id>tmf-xtext</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Xtext, Xtend",0) -->

+			<url>${eclipse.download}/modeling/tmf/xtext/updates/milestones/head/S201511100835/</url>

+		</repository>

+		<repository>

+			<id>webtools</id>

+			<layout>p2</layout>

+			<!-- updateFrom("WebTools",0) -->

+			<url>${eclipse.download}/webtools/downloads/drops/R3.8.0/S-3.8.0M3-20151111010029/repository/</url>

+		</repository>

+		<repository>

+			<id>XWT</id>

+			<layout>p2</layout>

+			<!-- updateFrom("XWT",0) -->

+			<url>${eclipse.download}/xwt/release-1.1.0</url>

+		</repository>

+		<repository>

+			<id>subversive</id>

+			<layout>p2</layout>

+			<!-- updateFrom("Subversive",0) -->

+			<url>${eclipse.download}/technology/subversive/3.0/neon-site/</url>

+		</repository>

+	</repositories>

+	<build>

+		<pluginManagement>

+			<plugins>

+				<plugin>

+					<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-resources-plugin</artifactId>

+					<version>2.6</version>

+					<configuration>

+						<encoding>UTF-8</encoding>

+					</configuration>

+				</plugin>

+				<plugin>

+					<groupId>org.apache.maven.plugins</groupId>

+					<artifactId>maven-clean-plugin</artifactId>

+					<version>2.6</version>

+				</plugin>

+				<plugin>

+					<groupId>org.eclipse.xtend</groupId>

+					<artifactId>xtend-maven-plugin</artifactId>

+					<version>${xtext.version}</version>

+				</plugin>

+			</plugins>

+		</pluginManagement>

+	</build>

+</project>