diff --git a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml
index 0c8c24b675..b198a9ead4 100644
--- a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml
+++ b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.feature/feature.xml
@@ -225,13 +225,13 @@
       <import plugin="io.sarl.lang.core" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.eclipse" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.commands" version="3.9.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface" version="3.15.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF
index 23f9946082..4333e9db2a 100644
--- a/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF
+++ b/contribs/io.sarl.experienceindex/io.sarl.experienceindex.plugin/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: io.sarl.experienceindex,
 Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0",
  io.sarl.eclipse;bundle-version="0.9.0",
  io.sarl.lang.ui;bundle-version="0.9.0",
- org.eclipse.xtext.ui;bundle-version="2.17.0",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
  org.eclipse.osgi;bundle-version="3.13.300",
  org.eclipse.core.commands;bundle-version="3.9.300",
  org.eclipse.core.runtime;bundle-version="3.15.200",
diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml
index 8ca9a24c3b..651c7c1b3a 100644
--- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml
+++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.feature/feature.xml
@@ -223,16 +223,16 @@
 
    <requires>
       <import plugin="io.sarl.lang" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="io.sarl.pythongenerator.generator" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.core" version="2.17.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.13.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
+      <import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
+      <import plugin="io.sarl.pythongenerator.generator" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtend.core" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.generator/META-INF/MANIFEST.MF b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.generator/META-INF/MANIFEST.MF
index 3c5b57822e..4dad896dae 100644
--- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.generator/META-INF/MANIFEST.MF
+++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.generator/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Export-Package: io.sarl.pythongenerator.generator,
  io.sarl.pythongenerator.generator.validator
 Bundle-Activator: io.sarl.pythongenerator.generator.PyGeneratorPlugin
 Require-Bundle: io.sarl.lang;bundle-version="0.9.0",
- org.eclipse.xtext.common.types;bundle-version="2.17.0",
- org.eclipse.xtext.xbase;bundle-version="2.17.0",
- org.eclipse.xtext;bundle-version="2.17.0",
- org.eclipse.xtend.core;bundle-version="2.17.0",
+ org.eclipse.xtext.common.types;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase;bundle-version="2.17.1",
+ org.eclipse.xtext;bundle-version="2.17.1",
+ org.eclipse.xtend.core;bundle-version="2.17.1",
  org.eclipse.core.runtime;bundle-version="3.15.200",
  org.eclipse.core.resources;bundle-version="3.13.300"
 
diff --git a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.ui/META-INF/MANIFEST.MF b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.ui/META-INF/MANIFEST.MF
index b8445f0799..25be799193 100644
--- a/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.ui/META-INF/MANIFEST.MF
+++ b/contribs/io.sarl.pythongenerator/io.sarl.pythongenerator.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Bundle-Activator: io.sarl.pythongenerator.ui.PyGeneratorUiPlugin
 Require-Bundle: io.sarl.lang;bundle-version="0.9.0",
  io.sarl.lang.ui;bundle-version="0.9.0",
  io.sarl.pythongenerator.generator;bundle-version="0.9.0",
- org.eclipse.xtext.ui;bundle-version="2.17.0",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
  org.eclipse.ui;bundle-version="3.112.0",
  org.eclipse.core.runtime;bundle-version="3.15.200"
 
diff --git a/formatting-styles/latex/sarl-beamer-listing.sty b/formatting-styles/latex/sarl-beamer-listing.sty
index 60a40bedca..b0c7a1d6e3 100644
--- a/formatting-styles/latex/sarl-beamer-listing.sty
+++ b/formatting-styles/latex/sarl-beamer-listing.sty
@@ -22,7 +22,7 @@
 % limitations under the License.
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{sarl-beamer-listing}[2019/04/05]
+\ProvidesPackage{sarl-beamer-listing}[2019/04/09]
 \newif\ifusesarlcolors\usesarlcolorstrue
 \DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
 \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
diff --git a/formatting-styles/latex/sarl-colorized-listing.sty b/formatting-styles/latex/sarl-colorized-listing.sty
index 07ceda78d2..2d27809cd1 100644
--- a/formatting-styles/latex/sarl-colorized-listing.sty
+++ b/formatting-styles/latex/sarl-colorized-listing.sty
@@ -22,7 +22,7 @@
 % limitations under the License.
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{sarl-colorized-listing}[2019/04/05]
+\ProvidesPackage{sarl-colorized-listing}[2019/04/09]
 \newif\ifusesarlcolors\usesarlcolorstrue
 \DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
 \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
diff --git a/formatting-styles/latex/sarl-listing.sty b/formatting-styles/latex/sarl-listing.sty
index c585009a15..1daceeba4f 100644
--- a/formatting-styles/latex/sarl-listing.sty
+++ b/formatting-styles/latex/sarl-listing.sty
@@ -22,7 +22,7 @@
 % limitations under the License.
 %
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{sarl-listing}[2019/04/05]
+\ProvidesPackage{sarl-listing}[2019/04/09]
 \newif\ifusesarlcolors\usesarlcolorstrue
 \DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
 \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
diff --git a/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
index f1ccfd28fa..d49053a1b4 100644
--- a/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Automatic-Module-Name: io.sarl.eclipse
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.lang.ui;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.xtend.core;bundle-version="2.17.0",
- org.eclipse.xtext.ui;bundle-version="2.17.0",
- org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
- org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
+ org.eclipse.xtend.core;bundle-version="2.17.1",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
  org.eclipse.ui.ide;bundle-version="3.15.0",
  org.eclipse.core.filesystem;bundle-version="1.7.300",
  org.eclipse.equinox.bidi;bundle-version="1.1.300",
diff --git a/main/coreplugins/io.sarl.lang.core/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.core/META-INF/MANIFEST.MF
index b0c6ba3e1a..c8fc95d949 100644
--- a/main/coreplugins/io.sarl.lang.core/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.lang.core/META-INF/MANIFEST.MF
@@ -6,12 +6,11 @@ Automatic-Module-Name: io.sarl.lang.core
 Bundle-Version: 0.9.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.17.0";visibility:=reexport,
+Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.17.1";visibility:=reexport,
  javax.inject;bundle-version="1.0.0"
 Export-Package: io.sarl.bootstrap,
  io.sarl.lang,
  io.sarl.lang.annotation,
- io.sarl.lang.bugfixes.pending.pr106,
  io.sarl.lang.core,
  io.sarl.lang.scoping.extensions.numbers.arithmetic,
  io.sarl.lang.scoping.extensions.numbers.cast,
diff --git a/main/coreplugins/io.sarl.lang.core/src-gen/io/sarl/lang/SARLVersion.java b/main/coreplugins/io.sarl.lang.core/src-gen/io/sarl/lang/SARLVersion.java
index db87c47e0e..2a62ddc492 100644
--- a/main/coreplugins/io.sarl.lang.core/src-gen/io/sarl/lang/SARLVersion.java
+++ b/main/coreplugins/io.sarl.lang.core/src-gen/io/sarl/lang/SARLVersion.java
@@ -94,7 +94,7 @@ public final class SARLVersion {
 
 	/** The minimal Xtext version to use SARL features.
 	 */
-	public static final String MINIMAL_XTEXT_VERSION = "2.17.0"; //$NON-NLS-1$
+	public static final String MINIMAL_XTEXT_VERSION = "2.17.1"; //$NON-NLS-1$
 
 	private SARLVersion() {
 		//
diff --git a/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
index 118123eac6..d793af2714 100644
--- a/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
@@ -8,14 +8,14 @@ Automatic-Module-Name: io.sarl.lang.mwe2
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0",
- org.eclipse.xtext.generator;bundle-version="2.17.0",
- org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
- org.eclipse.xtext.ui;bundle-version="2.17.0",
- org.eclipse.xtend.ide;bundle-version="2.17.0",
- org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
- org.eclipse.xtend.core;bundle-version="2.17.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.0",
- org.eclipse.xtext.builder;bundle-version="2.17.0",
+ org.eclipse.xtext.generator;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
+ org.eclipse.xtend.ide;bundle-version="2.17.1",
+ org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
+ org.eclipse.xtend.core;bundle-version="2.17.1",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.builder;bundle-version="2.17.1",
  org.eclipse.emf.mwe2.launch;bundle-version="2.10.0",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.equinox.common;bundle-version="3.10.300",
diff --git a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
index 3445cf7862..d002b0bfc3 100644
--- a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-SymbolicName: io.sarl.lang.ui; singleton:=true
 Automatic-Module-Name: io.sarl.lang.ui
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.lang;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.17.0",
- org.eclipse.xtext.ui.shared;bundle-version="2.17.0",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.0",
- org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
- org.eclipse.xtext.builder;bundle-version="2.17.0",
- org.eclipse.xtend.ide;bundle-version="2.17.0",
- org.eclipse.xtend.core;bundle-version="2.17.0",
- org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.ui.shared;bundle-version="2.17.1",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
+ org.eclipse.xtext.builder;bundle-version="2.17.1",
+ org.eclipse.xtend.ide;bundle-version="2.17.1",
+ org.eclipse.xtend.core;bundle-version="2.17.1",
+ org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
  org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.jdt.core;bundle-version="3.17.0",
  org.eclipse.jdt.ui;bundle-version="3.17.0",
diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
index 829634aa73..a3e2d242dd 100644
--- a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Automatic-Module-Name: io.sarl.lang
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.xtend.core;bundle-version="2.17.0",
- org.eclipse.xtext;bundle-version="2.17.0",
- org.eclipse.xtext.xbase;bundle-version="2.17.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.17.0",
- org.eclipse.xtext.common.types;bundle-version="2.17.0",
- org.eclipse.xtext.util;bundle-version="2.17.0",
+ org.eclipse.xtend.core;bundle-version="2.17.1",
+ org.eclipse.xtext;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase;bundle-version="2.17.1",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.17.1",
+ org.eclipse.xtext.common.types;bundle-version="2.17.1",
+ org.eclipse.xtext.util;bundle-version="2.17.1",
  org.eclipse.emf.codegen;bundle-version="2.15.0",
  org.eclipse.osgi;bundle-version="3.13.300",
  org.antlr.runtime;bundle-version="3.2.0",
diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java
index ec63118cf8..85dc27a260 100644
--- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java
+++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/compiler/batch/SarlBatchCompiler.java
@@ -2219,8 +2219,9 @@ private void installJvmTypeProvider(ResourceSet resourceSet, File temporaryClass
 		progress.subTask(Messages.SarlBatchCompiler_58);
 		final Iterable<File> classpath;
 		if (temporaryClassDirectory != null) {
-			classpath = Iterables.concat(getClassPath(), getSourcePaths(),
-					Collections.singletonList(temporaryClassDirectory));
+			classpath = Iterables.concat(
+					Collections.singletonList(temporaryClassDirectory),
+					getClassPath(), getSourcePaths());
 		} else {
 			classpath = Iterables.concat(getClassPath(), getSourcePaths());
 		}
diff --git a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
index 87e6347f9b..fef4a57445 100644
--- a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
+++ b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: io.sarl.m2e.SARLMavenEclipsePlugin
 Require-Bundle: io.sarl.eclipse;bundle-version="0.9.0",
- org.eclipse.xtext.util;bundle-version="2.17.0",
- org.eclipse.xtext.ui;bundle-version="2.17.0",
+ org.eclipse.xtext.util;bundle-version="2.17.1",
+ org.eclipse.xtext.ui;bundle-version="2.17.1",
  org.eclipse.emf.common;bundle-version="2.15.0",
  org.eclipse.emf.ecore;bundle-version="2.17.0",
  org.eclipse.core.runtime;bundle-version="3.15.200",
diff --git a/main/features/io.sarl.compiler/feature.xml b/main/features/io.sarl.compiler/feature.xml
index a8c5cb1b38..50bd9f1660 100644
--- a/main/features/io.sarl.compiler/feature.xml
+++ b/main/features/io.sarl.compiler/feature.xml
@@ -223,25 +223,24 @@
 
    <requires>
       <import plugin="io.sarl.lang.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.core" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util" version="2.17.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.codegen" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core" version="3.17.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.17.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
       <import plugin="org.slf4j.api" version="1.7.2" match="greaterOrEqual"/>
+      <import plugin="org.apache.commons.io" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j"/>
       <import plugin="io.sarl.lang" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui.shared" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.builder" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.ide" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types.ui" version="2.17.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.17.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.compare" version="3.7.500" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.debug.ui" version="3.10.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.editors" version="3.11.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.forms" version="3.7.500" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.codemining"/>
       <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.emf.common" version="2.15.0" match="compatible"/>
@@ -250,6 +249,8 @@
       <import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
       <import plugin="org.eclipse.debug.core" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.17.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.codegen" version="2.15.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore.xmi" version="2.15.0" match="compatible"/>
       <import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
@@ -266,20 +267,20 @@
       <import plugin="org.eclipse.core.expressions" version="3.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.ide"/>
       <import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.15.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.core" version="3.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
-      <import plugin="org.apache.commons.io" version="2.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.compare" version="3.7.500" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jdt.debug.ui" version="3.10.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.editors" version="3.11.400" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.forms" version="3.7.500" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.17.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.15.0" match="compatible"/>
+      <import plugin="org.eclipse.xtend.core" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.util" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui.shared" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.builder" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtend.ide" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types.ui" version="2.17.1" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/main/features/io.sarl.ide/feature.xml b/main/features/io.sarl.ide/feature.xml
index 5c07902edf..b8a96b060b 100644
--- a/main/features/io.sarl.ide/feature.xml
+++ b/main/features/io.sarl.ide/feature.xml
@@ -224,31 +224,6 @@ tools upon the Eclipse IDE.
 
    <requires>
       <import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtend.core" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types.ui" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.intro.quicklinks" version="1.0.300" match="greaterOrEqual"/>
-      <import plugin="org.arakhne.afc.core.vmutils" version="15.2.0" match="greaterOrEqual"/>
-      <import plugin="com.google.gson" version="2.8.5" match="greaterOrEqual"/>
-      <import plugin="io.sarl.eclipse" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common" version="2.15.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.core.variables" version="3.2.800" match="compatible"/>
-      <import plugin="org.eclipse.ui.console" version="3.5.300" match="compatible"/>
-      <import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.debug.core" version="3.9.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.11.0" match="compatible"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.equinox.common"/>
-      <import plugin="org.eclipse.xtext"/>
       <import plugin="org.eclipse.ui.ide" version="3.15.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.filesystem" version="1.7.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.equinox.bidi" version="1.1.300" match="greaterOrEqual"/>
@@ -265,7 +240,12 @@ tools upon the Eclipse IDE.
       <import plugin="org.eclipse.ui.console" version="3.8.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.intro" version="3.5.500" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.intro.quicklinks" version="1.0.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.intro.universal" version="3.3.400" match="greaterOrEqual"/>
+      <import plugin="org.arakhne.afc.core.vmutils" version="15.2.0" match="greaterOrEqual"/>
+      <import plugin="com.google.gson" version="2.8.5" match="greaterOrEqual"/>
+      <import plugin="io.sarl.eclipse" version="0.9.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common" version="2.15.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.17.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.13.300" match="greaterOrEqual"/>
@@ -273,7 +253,27 @@ tools upon the Eclipse IDE.
       <import plugin="org.eclipse.m2e.maven.runtime" version="1.11.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.m2e.core" version="1.11.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.m2e.jdt" version="1.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.core.variables" version="3.2.800" match="compatible"/>
       <import plugin="org.eclipse.ui" version="3.111.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.console" version="3.5.300" match="compatible"/>
+      <import plugin="org.eclipse.help" version="3.4.0" match="compatible"/>
+      <import plugin="org.eclipse.debug.core" version="3.9.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.11.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
+      <import plugin="org.eclipse.equinox.common"/>
+      <import plugin="org.eclipse.xtext"/>
+      <import plugin="org.eclipse.xtend.core" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types.ui" version="2.17.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.util" version="2.17.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/main/features/io.sarl.lib/feature.xml b/main/features/io.sarl.lib/feature.xml
index fd1098c635..deda8e4a17 100644
--- a/main/features/io.sarl.lib/feature.xml
+++ b/main/features/io.sarl.lib/feature.xml
@@ -224,10 +224,10 @@
    <requires>
       <import plugin="io.sarl.lang.core" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.util" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.17.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.core" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.17.1" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/main/targetplatform/io.sarl.lang.targetplatform.target b/main/targetplatform/io.sarl.lang.targetplatform.target
index b781929e83..79b7ace207 100644
--- a/main/targetplatform/io.sarl.lang.targetplatform.target
+++ b/main/targetplatform/io.sarl.lang.targetplatform.target
@@ -16,7 +16,6 @@
 			<unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.10.0.v201811122225"/>
 			<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.10.0.v201811170421"/>
 			<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.13.0.v201901310548"/>
-			<unit id="org.eclipse.xtext.sdk.feature.group" version="2.17.0.v20190304-1445"/>
 			<unit id="org.eclipse.xsd.feature.group" version="2.16.0.v20181220-0848"/>
 			<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.17.2.201606141937-signed-20160830073346"/>
 		</location>
@@ -46,6 +45,10 @@
 			<unit id="javax.inject" version="1.0.0"/>
 			<repository location="http://dependencies.sarl.io"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="2.17.1.v20190403-0733"/>
+			<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.17.1"/>
+		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 </target>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7d93a3db3e..930b2eb77d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,9 +33,9 @@
 		<!-- 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.17.0</xtext.version>
-		<xtext.version.current>2.17.0</xtext.version.current>
-		<xtext.version.next>2.17.1</xtext.version.next>
+		<xtext.version>2.17.1</xtext.version>
+		<xtext.version.current>2.17.1</xtext.version.current>
+		<xtext.version.next>2.17.2</xtext.version.next>
 		<!-- Version of the MWE2 library (used for accessing the mwe2 P2 http://download.eclipse.org/modeling/emft/mwe/updates/releases/, 
 			see compositeContent.{xml,jar,xz,xml.xz} file) -->
 		<mwe2.version>2.9.0</mwe2.version>
diff --git a/tycho-parent/pom.xml b/tycho-parent/pom.xml
index 3aaa13c8c3..9229d99d16 100644
--- a/tycho-parent/pom.xml
+++ b/tycho-parent/pom.xml
@@ -240,11 +240,11 @@
 		     The list of the available P2 repositories is available at:
 		     https://eclipse.org/Xtext/documentation/350_continuous_integration.html
 		     -->
-		<!-- <repository>
+		<repository>
 			<id>org.eclipse.modeling.tmf.xtext.updates</id>
 			<layout>p2</layout>
 			<url>http://download.eclipse.org/modeling/tmf/xtext/updates/releases/${xtext.version.current}/</url>
-		</repository> -->
+		</repository>
 		<!-- Eclipse and related libraries -->
 		<repository>
 			<id>org.eclipse.ide.photon</id>