From e7f81a97071140f4e797be7807af886b5f254a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Galland?= <galland@arakhne.org>
Date: Sat, 12 Aug 2017 19:03:23 +0200
Subject: [PATCH] [all] Change the Tycho configuration.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In order to force Tycho to consider a single version of Xtext, the Maven
configuration is updated.

see #708

Signed-off-by: Stéphane Galland <galland@arakhne.org>
---
 main/apiplugins/pom.xml     |  4 +++-
 main/coreplugins/pom.xml    |  3 ++-
 main/externalmaven/pom.xml  |  3 ++-
 main/features/pom.xml       |  3 ++-
 main/internalmaven/pom.xml  |  3 ++-
 main/pom.xml                |  3 +--
 main/targetplatform/pom.xml |  3 ++-
 pom.xml                     | 21 ++++++++++++------
 tycho-parent/pom.xml        | 43 ++++++++++++++++++++++++++++++-------
 9 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/main/apiplugins/pom.xml b/main/apiplugins/pom.xml
index 6c20d245c9..100f593163 100644
--- a/main/apiplugins/pom.xml
+++ b/main/apiplugins/pom.xml
@@ -4,8 +4,10 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl.tycho-parent</artifactId>
+		<version>0.5.7</version>
+		<relativePath>../../tycho-parent</relativePath>
 	</parent>
 
 	<artifactId>io.sarl.plugins.api</artifactId>
diff --git a/main/coreplugins/pom.xml b/main/coreplugins/pom.xml
index 81024d29c4..61d846e1bc 100644
--- a/main/coreplugins/pom.xml
+++ b/main/coreplugins/pom.xml
@@ -4,8 +4,9 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl.tycho-parent</artifactId>
+		<relativePath>../../tycho-parent</relativePath>
 	</parent>
 
 	<artifactId>io.sarl.plugins.core</artifactId>
diff --git a/main/externalmaven/pom.xml b/main/externalmaven/pom.xml
index 867a8aa2ea..c13f25208b 100644
--- a/main/externalmaven/pom.xml
+++ b/main/externalmaven/pom.xml
@@ -4,8 +4,9 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl</artifactId>
+		<relativePath>../..</relativePath>
 	</parent>
 
 	<groupId>io.sarl.maven</groupId>
diff --git a/main/features/pom.xml b/main/features/pom.xml
index 3034555f31..8163e86c7a 100644
--- a/main/features/pom.xml
+++ b/main/features/pom.xml
@@ -4,8 +4,9 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl.tycho-parent</artifactId>
+		<relativePath>../../tycho-parent</relativePath>
 	</parent>
 
 	<artifactId>io.sarl.features</artifactId>
diff --git a/main/internalmaven/pom.xml b/main/internalmaven/pom.xml
index b6cd7c68c9..5b4dce76e1 100644
--- a/main/internalmaven/pom.xml
+++ b/main/internalmaven/pom.xml
@@ -4,8 +4,9 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl</artifactId>
+		<relativePath>../..</relativePath>
 	</parent>
 
 	<groupId>io.sarl.maven</groupId>
diff --git a/main/pom.xml b/main/pom.xml
index 66dbb299f1..735c8c3184 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,9 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.tycho-parent</artifactId>
 		<version>0.5.6</version>
-		<relativePath>../tycho-parent</relativePath>
+		<artifactId>io.sarl</artifactId>
 	</parent>
 
 	<artifactId>io.sarl.main</artifactId>
diff --git a/main/targetplatform/pom.xml b/main/targetplatform/pom.xml
index ca672a81b1..06e8877fff 100644
--- a/main/targetplatform/pom.xml
+++ b/main/targetplatform/pom.xml
@@ -4,8 +4,9 @@
 
 	<parent>
 		<groupId>io.sarl</groupId>
-		<artifactId>io.sarl.main</artifactId>
 		<version>0.5.6</version>
+		<artifactId>io.sarl.tycho-parent</artifactId>
+		<relativePath>../../tycho-parent</relativePath>
 	</parent>
 
 	<artifactId>io.sarl.lang.targetplatform</artifactId>
diff --git a/pom.xml b/pom.xml
index 3bbc8a0e3f..47af3566ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,17 @@
 		<!-- Version of the SARL API -->
 		<sarl.version>0.5.6</sarl.version>
 		<janus.version>2.${sarl.version}</janus.version>
+
+		<!-- The versions of the following Xtext libraries are available at:
+		     https://eclipse.org/Xtext/documentation/350_continuous_integration.html -->
+
 		<!-- Version of the Xtext API -->
 		<xtext.version>2.11.0</xtext.version>
-		<xtext.versionRange>[2.11.0,2.11.1)</xtext.versionRange><!-- For generating 
-			a correct version range you need to create a range integrating ONLY the current 
-			version and excluding all other possible versions especially the greater 
-			ones -->
+		<xtext.version.next>2.11.1</xtext.version.next>
+		<!-- Version of the MWE2 library -->
+		<mwe2.version>2.9.0</mwe2.version>
+		<!-- Version of the Xpand library -->
+		<xpand.version>R201605260315</xpand.version>
 		
 		<!-- Version of the OSGi module that provides the NLS -->
 		<osgi.nls.version>3.10.0-v20140606-1445</osgi.nls.version>
@@ -43,9 +48,11 @@
 		<!-- Version of the javax.inject module -->
 		<javaxinject.version>1</javaxinject.version>
 		<!-- Version of the Tycho module -->
-		<tycho.version>0.26.0</tycho.version>
-		<!--  -->
+		<tycho.version>1.0.0</tycho.version>
+		<!-- Version of the JavaFX library -->
 		<efxclipse.version>2.4.0</efxclipse.version>
+		<!-- Version of the ZeroMQ library -->
+		<zeromq.version>0.3.6</zeromq.version>
 
 		<!-- Build ID Format (used in Eclipse about dialog) -->
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
@@ -324,7 +331,7 @@
 			<dependency>
 				<groupId>org.zeromq</groupId>
 				<artifactId>jeromq</artifactId>
-				<version>0.3.6</version>
+				<version>${zeromq.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>com.google.code.gson</groupId>
diff --git a/tycho-parent/pom.xml b/tycho-parent/pom.xml
index 46d0af3da3..c474fabde5 100644
--- a/tycho-parent/pom.xml
+++ b/tycho-parent/pom.xml
@@ -73,7 +73,14 @@
 							<type>eclipse-plugin</type>
 							<id>org.eclipse.xtext.xbase.lib</id>
 							<restrictTo>
-								<versionRange>${xtext.versionRange}</versionRange>
+								<versionRange>[${xtext.version},${xtext.version.next})</versionRange>
+							</restrictTo>
+						</filter>
+						<filter>
+							<type>eclipse-plugin</type>
+							<id>org.zeromq.jeromq</id>
+							<restrictTo>
+								<version>${zeromq.version}</version>
 							</restrictTo>
 						</filter>
 
@@ -211,6 +218,27 @@
 	<!-- ===================== -->
 
 	<repositories>
+		<!-- Use the different P2 repositories in place of the P2 composite repository.
+		     The list of the available P2 repositories is available at:
+		     https://eclipse.org/Xtext/documentation/350_continuous_integration.html
+		     -->
+		<repository>
+			<id>org.eclipse.modeling.tmf.xtext.updates</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtext.version}/</url>
+		</repository>
+		<repository>
+			<id>org.eclipse.modeling.emft.mwe.updates</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/emft/mwe/updates/releases/${mwe2.version}/</url>
+		</repository>
+		<repository>
+			<id>org.eclipse.modeling.m2t.xpand.updates</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/releases/${xpand.version}/</url>
+		</repository>
+		<!-- Eclipse and related libraries
+		     -->
 		<repository>
 			<id>org.eclipse.ide.neon</id>
 			<layout>p2</layout>
@@ -222,25 +250,24 @@
 			<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-jdt-compiler/</url>
 		</repository>
 		<repository>
-			<id>org.eclipse.modeling.tmf.xtext.updates</id>
+			<id>org.eclipse.efxeclipse.updates</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/</url>
+			<url>http://download.eclipse.org/efxclipse/updates-released/${efxclipse.version}/site</url>
 		</repository>
+		<!-- Arakhne libraries
+		     -->
 		<repository>
 			<id>org.arakhne.p2</id>
 			<layout>p2</layout>
 			<url>http://download.tuxfamily.org/arakhne/p2/</url>
 		</repository>
+		<!-- SARL dependencies
+		     -->
 		<repository>
 			<id>io.sarl.dependencies</id>
 			<layout>p2</layout>
 			<url>http://dependencies.sarl.io</url>
 		</repository>
-		<repository>
-			<id>org.eclipse.efxeclipse.updates</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/efxclipse/updates-released/${efxclipse.version}/site</url>
-		</repository>
 	</repositories>
 
 </project>