[all] Upgrade to Eclipse 2018-09.

close #860 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Sep 27, 2018 · 230210e · 230210e
1 parent 406c675
commit 230210e
Show file tree

Hide file tree

Showing 42 changed files with 308 additions and 456 deletions.
diff --git a/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml b/contribs/io.sarl.examples/io.sarl.examples.feature/feature.xml
@@ -223,13 +223,13 @@
 
    <requires>
       <import plugin="io.sarl.eclipse" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.109.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common.ui" version="2.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.m2e" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.debug.ui" version="3.13.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.110.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common.ui" version="2.14.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.14.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.ui" version="3.13.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.13.100" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/contribs/io.sarl.examples/io.sarl.examples.plugin/META-INF/MANIFEST.MF b/contribs/io.sarl.examples/io.sarl.examples.plugin/META-INF/MANIFEST.MF
@@ -9,10 +9,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.eclipse;bundle-version="0.9.0",
  io.sarl.m2e;bundle-version="0.9.0",
- org.eclipse.ui;bundle-version="3.109.100",
- org.eclipse.core.runtime;bundle-version="3.14.0",
- org.eclipse.emf.common.ui;bundle-version="2.13.0",
- org.eclipse.ui.ide;bundle-version="3.14.0",
- org.eclipse.debug.ui;bundle-version="3.13.0",
- org.eclipse.core.resources;bundle-version="3.13.0"
+ org.eclipse.ui;bundle-version="3.110.0",
+ org.eclipse.core.runtime;bundle-version="3.15.0",
+ org.eclipse.emf.common.ui;bundle-version="2.14.0",
+ org.eclipse.ui.ide;bundle-version="3.14.100",
+ org.eclipse.debug.ui;bundle-version="3.13.100",
+ org.eclipse.core.resources;bundle-version="3.13.100"
 Export-Package: io.sarl.examples.wizard
diff --git 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="org.eclipse.osgi" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.commands" version="3.9.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.109.100" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi" version="3.13.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.commands" version="3.9.200" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface" version="3.14.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.110.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.1.0" 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
@@ -13,10 +13,10 @@ 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.15.0",
- org.eclipse.osgi;bundle-version="3.13.0",
- org.eclipse.core.commands;bundle-version="3.9.100",
- org.eclipse.core.runtime;bundle-version="3.14.0",
- org.eclipse.jface;bundle-version="3.14.0",
- org.eclipse.ui;bundle-version="3.109.100",
+ org.eclipse.osgi;bundle-version="3.13.100",
+ org.eclipse.core.commands;bundle-version="3.9.200",
+ org.eclipse.core.runtime;bundle-version="3.15.0",
+ org.eclipse.jface;bundle-version="3.14.100",
+ org.eclipse.ui;bundle-version="3.110.0",
  com.google.inject;bundle-version="4.1.0"
 Bundle-Activator: io.sarl.experienceindex.eclipse.SarlExperienceIndexPlugin
diff --git 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="org.eclipse.xtext.common.types" version="2.15.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase" version="2.15.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext" version="2.15.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.core" version="2.15.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.15.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types" version="2.15.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.runtime" version="3.14.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.pythongenerator.generator" version="0.9.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.109.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.15.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.13.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.110.0" 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
@@ -17,5 +17,5 @@ Require-Bundle: io.sarl.lang;bundle-version="0.9.0",
  org.eclipse.xtext.xbase;bundle-version="2.15.0",
  org.eclipse.xtext;bundle-version="2.15.0",
  org.eclipse.xtend.core;bundle-version="2.15.0",
- org.eclipse.core.runtime;bundle-version="3.14.0",
- org.eclipse.core.resources;bundle-version="3.13.0"
+ org.eclipse.core.runtime;bundle-version="3.15.0",
+ org.eclipse.core.resources;bundle-version="3.13.100"
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
@@ -15,5 +15,5 @@ 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.15.0",
- org.eclipse.ui;bundle-version="3.109.100",
- org.eclipse.core.runtime;bundle-version="3.14.0"
+ org.eclipse.ui;bundle-version="3.110.0",
+ org.eclipse.core.runtime;bundle-version="3.15.0"
diff --git a/docs/io.sarl.docs.doclet/pom.xml b/docs/io.sarl.docs.doclet/pom.xml
@@ -31,6 +31,16 @@
 			<artifactId>io.sarl.maven.batchcompiler</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- The following dependency is included in order to be sure that correct version is used
+		     due to a conflict between the base libs for SARL and maven-core -->
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/docs/io.sarl.docs.markdown/pom.xml b/docs/io.sarl.docs.markdown/pom.xml
@@ -23,24 +23,6 @@
 	</properties>
 
 	<dependencies>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.12.2</version>
-		</dependency>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.platform</groupId>
-			<artifactId>org.eclipse.core.runtime</artifactId>
-			<version>3.12.0</version>
-		</dependency>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.platform</groupId>
-			<artifactId>org.eclipse.equinox.common</artifactId>
-			<version>3.8.0</version>
-		</dependency>
 		<dependency>
 			<groupId>io.sarl.maven</groupId>
 			<artifactId>io.sarl.maven.docs.testing</artifactId>

diff --git a/main/apiplugins/io.sarl.javafx/META-INF/MANIFEST.MF b/main/apiplugins/io.sarl.javafx/META-INF/MANIFEST.MF
@@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: io.sarl.javafx
 Require-Bundle: io.sarl.util;bundle-version="0.9.0",
  io.sarl.core;bundle-version="0.9.0",
- org.eclipse.osgi;bundle-version="3.13.0"
+ org.eclipse.osgi;bundle-version="3.13.100"
 
diff --git a/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF b/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Export-Package: io.sarl.eventdispatching,
  io.sarl.sarlspecification,
  io.sarl.util
 Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.osgi;bundle-version="3.13.0"
+ org.eclipse.osgi;bundle-version="3.13.100"
 
diff --git a/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
@@ -12,26 +12,27 @@ Require-Bundle: io.sarl.lang.ui;bundle-version="0.9.0";visibility:=reexport,
  org.eclipse.xtext.ui;bundle-version="2.15.0",
  org.eclipse.xtext.xbase.ui;bundle-version="2.15.0",
  org.eclipse.xtext.common.types.ui;bundle-version="2.15.0",
- org.eclipse.ui.ide;bundle-version="3.14.0",
- org.eclipse.core.filesystem;bundle-version="1.7.100",
- org.eclipse.equinox.bidi;bundle-version="1.1.100",
- org.eclipse.core.variables;bundle-version="3.4.100",
- org.eclipse.core.net;bundle-version="1.3.200",
- org.eclipse.debug.ui;bundle-version="3.13.0",
- org.eclipse.ui.navigator;bundle-version="3.7.100",
- org.eclipse.jdt.core;bundle-version="3.14.0",
- org.eclipse.jdt.ui;bundle-version="3.14.0",
- org.eclipse.jdt.launching;bundle-version="3.10.0",
- org.eclipse.jdt.debug.ui;bundle-version="3.9.0",
- org.eclipse.core.expressions;bundle-version="3.6.100",
- org.eclipse.search;bundle-version="3.11.200",
- org.eclipse.ui.console;bundle-version="3.8.0",
- org.eclipse.ui;bundle-version="3.109.100",
- org.eclipse.ui.intro;bundle-version="3.5.200",
- org.eclipse.ui.intro.quicklinks;bundle-version="1.0.200",
- org.eclipse.ui.intro.universal;bundle-version="3.3.200",
- org.arakhne.afc.core.vmutils;bundle-version="14.0.0",
- com.google.code.gson;bundle-version="2.8.0"
+ org.eclipse.ui.ide;bundle-version="3.14.100",
+ org.eclipse.core.filesystem;bundle-version="1.7.200",
+ org.eclipse.equinox.bidi;bundle-version="1.1.200",
+ org.eclipse.core.variables;bundle-version="3.4.200",
+ org.eclipse.core.net;bundle-version="1.3.300",
+ org.eclipse.debug.ui;bundle-version="3.13.100",
+ org.eclipse.ui.navigator;bundle-version="3.7.200",
+ org.eclipse.jdt.core;bundle-version="3.15.0",
+ org.eclipse.jdt.ui;bundle-version="3.15.0",
+ org.eclipse.jdt.launching;bundle-version="3.11.0",
+ org.eclipse.jdt.debug.ui;bundle-version="3.10.0",
+ org.eclipse.core.expressions;bundle-version="3.6.200",
+ org.eclipse.search;bundle-version="3.11.300",
+ org.eclipse.ui.console;bundle-version="3.8.100",
+ org.eclipse.ui;bundle-version="3.110.0",
+ org.eclipse.ui.intro;bundle-version="3.5.300",
+ org.eclipse.ui.intro.quicklinks;bundle-version="1.0.300",
+ org.eclipse.ui.intro.universal;bundle-version="3.3.300",
+ org.arakhne.afc.core.vmutils;bundle-version="15.0.0",
+ com.google.gson;bundle-version="2.8.5",
+ com.google.inject;bundle-version="4.1.0"
 Bundle-Activator: io.sarl.eclipse.SARLEclipsePlugin
 Export-Package: io.sarl.eclipse,
  io.sarl.eclipse.buildpath,

diff --git a/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
@@ -18,12 +18,12 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0",
  org.eclipse.xtext.builder;bundle-version="2.15.0",
  org.eclipse.emf.mwe2.launch;bundle-version="2.9.1",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.equinox.common;bundle-version="3.10.0",
- org.eclipse.jdt.core;bundle-version="3.14.0",
- org.apache.commons.logging;bundle-version="1.1.1",
+ org.eclipse.equinox.common;bundle-version="3.10.100",
+ org.eclipse.jdt.core;bundle-version="3.15.0",
+ org.apache.commons.logging;bundle-version="1.2.0",
  org.objectweb.asm;bundle-version="6.2.1",
  aopalliance;bundle-version="1.0.0",
- org.eclipse.compare;bundle-version="3.7.200"
+ org.eclipse.compare;bundle-version="3.7.300"
 Export-Package: io.sarl.lang.mwe2,
  io.sarl.lang.mwe2.binding,
  io.sarl.lang.mwe2.bugfixes.unpublished,

diff --git a/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
@@ -16,14 +16,14 @@ Require-Bundle: io.sarl.lang;bundle-version="0.9.0";visibility:=reexport,
  org.eclipse.xtend.core;bundle-version="2.15.0",
  org.eclipse.xtext.common.types.ui;bundle-version="2.15.0",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.jdt.core;bundle-version="3.14.0",
- org.eclipse.jdt.ui;bundle-version="3.14.0",
- org.eclipse.compare;bundle-version="3.7.200",
- org.eclipse.jdt.debug.ui;bundle-version="3.9.0",
- org.eclipse.ui;bundle-version="3.109.100",
- org.eclipse.ui.editors;bundle-version="3.11.100",
+ org.eclipse.jdt.core;bundle-version="3.15.0",
+ org.eclipse.jdt.ui;bundle-version="3.15.0",
+ org.eclipse.compare;bundle-version="3.7.300",
+ org.eclipse.jdt.debug.ui;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.110.0",
+ org.eclipse.ui.editors;bundle-version="3.11.200",
  org.antlr.runtime;bundle-version="3.2.0",
- org.eclipse.ui.forms;bundle-version="3.7.200"
+ org.eclipse.ui.forms;bundle-version="3.7.300"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: io.sarl.lang.ui.internal.LangActivator
 Export-Package: io.sarl.lang.ide,

diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
@@ -14,14 +14,14 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0";visibility:=reexport,
  org.eclipse.xtext.xbase.lib;bundle-version="2.15.0",
  org.eclipse.xtext.common.types;bundle-version="2.15.0",
  org.eclipse.xtext.util;bundle-version="2.15.0",
- org.eclipse.emf.codegen;bundle-version="2.13.0",
- org.eclipse.osgi;bundle-version="3.13.0",
+ org.eclipse.emf.codegen;bundle-version="2.14.0",
+ org.eclipse.osgi;bundle-version="3.13.100",
  org.antlr.runtime;bundle-version="3.2.0",
  org.objectweb.asm;bundle-version="6.2.1";resolution:=optional,
- org.eclipse.jdt.core;bundle-version="3.14.0",
- org.eclipse.emf.ecore;bundle-version="2.14.0",
- org.eclipse.emf.common;bundle-version="2.14.0",
- org.eclipse.core.runtime;bundle-version="3.14.0",
+ org.eclipse.jdt.core;bundle-version="3.15.0",
+ org.eclipse.emf.ecore;bundle-version="2.15.0",
+ org.eclipse.emf.common;bundle-version="2.15.0",
+ org.eclipse.core.runtime;bundle-version="3.15.0",
  org.slf4j.api;bundle-version="1.7.2",
  org.apache.commons.io;bundle-version="2.2.0"
 Bundle-Activator: io.sarl.lang.SARLLangActivator

diff --git a/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
@@ -11,17 +11,17 @@ Bundle-Activator: io.sarl.m2e.SARLMavenEclipsePlugin
 Require-Bundle: io.sarl.eclipse;bundle-version="0.9.0",
  org.eclipse.xtext.util;bundle-version="2.15.0",
  org.eclipse.xtext.ui;bundle-version="2.15.0",
- org.eclipse.emf.common;bundle-version="2.14.0",
- org.eclipse.emf.ecore;bundle-version="2.14.0",
- org.eclipse.core.runtime;bundle-version="3.14.0",
- org.eclipse.core.resources;bundle-version="3.13.0",
- org.eclipse.ui;bundle-version="3.109.100",
- org.eclipse.jdt.core;bundle-version="3.14.0",
- org.eclipse.ui.ide;bundle-version="3.14.0",
- org.eclipse.m2e.core.ui;bundle-version="1.9.0",
- org.eclipse.m2e.maven.runtime;bundle-version="1.9.0",
- org.eclipse.m2e.core;bundle-version="1.9.0",
- org.eclipse.m2e.jdt;bundle-version="1.9.0"
+ org.eclipse.emf.common;bundle-version="2.15.0",
+ org.eclipse.emf.ecore;bundle-version="2.15.0",
+ org.eclipse.core.runtime;bundle-version="3.15.0",
+ org.eclipse.core.resources;bundle-version="3.13.100",
+ org.eclipse.ui;bundle-version="3.110.0",
+ org.eclipse.jdt.core;bundle-version="3.15.0",
+ org.eclipse.ui.ide;bundle-version="3.14.100",
+ org.eclipse.m2e.core.ui;bundle-version="1.9.1",
+ org.eclipse.m2e.maven.runtime;bundle-version="1.9.1",
+ org.eclipse.m2e.core;bundle-version="1.9.1",
+ org.eclipse.m2e.jdt;bundle-version="1.9.1"
 Export-Package: io.sarl.m2e,
  io.sarl.m2e.config,
  io.sarl.m2e.sre,

diff --git a/main/externalmaven/io.sarl.maven.docs.generator/pom.xml b/main/externalmaven/io.sarl.maven.docs.generator/pom.xml
@@ -41,6 +41,24 @@
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-compiler-plugin</artifactId>
 		</dependency>
+		<!-- FIXME: Remove asap if the project compile without -->
+		<dependency>
+			<groupId>org.eclipse.jdt</groupId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
+			<version>3.12.2</version>
+		</dependency>
+		<!-- FIXME: Remove asap if the project compile without -->
+		<dependency>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.core.runtime</artifactId>
+			<version>3.12.0</version>
+		</dependency>
+		<!-- FIXME: Remove asap if the project compile without -->
+		<dependency>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.equinox.common</artifactId>
+			<version>3.8.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/main/externalmaven/io.sarl.maven.docs.testing/pom.xml b/main/externalmaven/io.sarl.maven.docs.testing/pom.xml
@@ -13,24 +13,6 @@
 	<description>Provides API for testing documentation</description>
 
 	<dependencies>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.12.2</version>
-		</dependency>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.platform</groupId>
-			<artifactId>org.eclipse.core.runtime</artifactId>
-			<version>3.12.0</version>
-		</dependency>
-		<!-- FIXME: Remove asap if the project compile without -->
-		<dependency>
-			<groupId>org.eclipse.platform</groupId>
-			<artifactId>org.eclipse.equinox.common</artifactId>
-			<version>3.8.0</version>
-		</dependency>
 		<dependency>
 			<groupId>io.sarl.maven</groupId>
 			<artifactId>io.sarl.maven.sdk</artifactId>

diff --git a/main/externalmaven/io.sarl.maven.sre/pom.xml b/main/externalmaven/io.sarl.maven.sre/pom.xml
@@ -47,6 +47,16 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- The following dependency is included in order to be sure that correct version is used
+		     due to a conflict between the base libs for SARL and maven-core -->
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>