[all] Upgrade to Guice 4.2.3.

see #1012 Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Jun 24, 2020 · d59fce3 · d59fce3
1 parent b04ba01
commit d59fce3
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 42 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
@@ -224,16 +224,16 @@
    <requires>
       <import plugin="io.sarl.eclipse" version="0.12.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.m2e" version="0.12.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.common.ui" version="2.18.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.115.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.17.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.common.ui" version="2.18.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.16.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" version="3.14.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.13.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.launching" version="3.16.0" match="greaterOrEqual"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.2.3" 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
@@ -19,7 +19,7 @@ Require-Bundle: io.sarl.eclipse;bundle-version="0.12.0",
  org.eclipse.core.resources;bundle-version="3.13.600",
  org.eclipse.jdt.launching;bundle-version="3.16.0",
  javax.inject;bundle-version="1.0.0",
- com.google.inject;bundle-version="4.1.0"
+ com.google.inject;bundle-version="4.2.3"
 Export-Package: io.sarl.examples,
  io.sarl.examples.wizard
 Import-Package: io.sarl.m2e.wizards.importproject
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.12.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.eclipse" version="0.12.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.ui" version="0.12.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.15.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.commands" version="3.9.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.17.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface" version="3.18.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.115.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.2.3" 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
@@ -18,5 +18,5 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.12.0",
  org.eclipse.core.runtime;bundle-version="3.17.0",
  org.eclipse.jface;bundle-version="3.18.0",
  org.eclipse.ui;bundle-version="3.115.0",
- com.google.inject;bundle-version="4.1.0"
+ com.google.inject;bundle-version="4.2.3"
 Bundle-Activator: io.sarl.experienceindex.eclipse.SarlExperienceIndexPlugin
diff --git a/main/apiplugins/io.sarl.api.bootiquebase/META-INF/MANIFEST.MF b/main/apiplugins/io.sarl.api.bootiquebase/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: io.sarl.lang.core;bundle-version="0.12.0",
  io.bootique;bundle-version="1.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.20.0",
- com.google.inject;bundle-version="4.1.0",
+ com.google.inject;bundle-version="4.2.3",
  org.eclipse.osgi;bundle-version="3.15.100",
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.11.0",
  org.arakhne.afc.bootique.variables;bundle-version="16.0.0"

diff --git a/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF b/main/apiplugins/io.sarl.util/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: io.sarl.sarlspecification,
  io.sarl.util
 Require-Bundle: io.sarl.lang.core;bundle-version="0.12.0";visibility:=reexport,
  org.eclipse.osgi;bundle-version="3.15.100",
- com.google.inject;bundle-version="4.1.0",
+ com.google.inject;bundle-version="4.2.3",
  javax.inject;bundle-version="1.0.0",
  org.arakhne.afc.bootique.variables;bundle-version="16.0.0"
 
diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.12.0";visibility:=reexport,
  org.objectweb.asm;bundle-version="7.2.0";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="2.20.0",
  org.eclipse.emf.common;bundle-version="2.17.0",
- com.google.inject;bundle-version="4.1.0",
+ com.google.inject;bundle-version="4.2.3",
  org.apache.commons.io;bundle-version="2.6.0",
  org.eclipse.core.runtime;bundle-version="3.17.0"
 Bundle-Activator: io.sarl.lang.SARLLangActivator

diff --git a/main/features/io.sarl.compiler/feature.xml b/main/features/io.sarl.compiler/feature.xml
@@ -234,7 +234,6 @@
       <import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.17.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.io" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.17.0" match="greaterOrEqual"/>
       <import plugin="org.apache.log4j"/>
@@ -246,7 +245,6 @@
       <import plugin="org.eclipse.xtext.builder" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.ide" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.common.types.ui" version="2.20.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.core" version="3.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui" version="3.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.compare" version="3.7.800" match="greaterOrEqual"/>
@@ -280,6 +278,7 @@
       <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="com.google.inject" version="4.2.3" 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
@@ -329,4 +329,18 @@ tools upon the Eclipse IDE.
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="org.slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/main/features/io.sarl.lib/feature.xml b/main/features/io.sarl.lib/feature.xml
@@ -224,11 +224,13 @@
    <requires>
       <import plugin="io.sarl.lang.core" version="0.12.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.util" version="0.12.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
-      <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.15.100" match="greaterOrEqual"/>
+      <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.xbase.lib" version="2.20.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.lib" version="2.20.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.2.3" match="greaterOrEqual"/>
+      <import plugin="org.arakhne.afc.bootique.variables" version="16.0.0" match="greaterOrEqual"/>
+      <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.11.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/main/internalmaven/io.sarl.maven.baselib/pom.xml b/main/internalmaven/io.sarl.maven.baselib/pom.xml
@@ -38,10 +38,6 @@
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.google.inject.extensions</groupId>
-			<artifactId>guice-multibindings</artifactId>
-		</dependency>
 		<!-- Force the version of ASM -->
 		<dependency>
 			<groupId>org.ow2.asm</groupId>

diff --git a/main/targetplatform/io.sarl.lang.targetplatform.target b/main/targetplatform/io.sarl.lang.targetplatform.target
@@ -39,8 +39,7 @@
 			<unit id="com.google.guava" version="27.1.0.jre"/>
 			<unit id="com.google.guava.testlib" version="27.1.0.jre"/>
 			<unit id="com.google.gson" version="2.8.5"/>
-			<unit id="com.google.inject" version="4.1.0"/>
-			<unit id="com.google.inject.multibindings" version="4.1.0"/>
+			<unit id="com.google.inject" version="4.2.3"/>
 			<unit id="javax.inject" version="1.0.0"/>
 			<unit id="java-uuid-generator" version="4.0.1"/>
 		</location>

diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@
 			see compositeContent.{xml,jar,xz,xml.xz} file) -->
 		<xpand.version>R201605260315</xpand.version>
 		<!-- Version of Guice (package: com.google.inject:guice). -->
-		<guice.version>4.1.0</guice.version>
+		<guice.version>4.2.3</guice.version>
 		<!-- Version of the OSGi module that provides the NLS (package: osgi) -->
 		<osgi.nls.version>3.10.0-v20140606-1445</osgi.nls.version>
 		<!-- Version of the Arakhne Foundation classes -->
@@ -489,11 +489,6 @@
 				<artifactId>guice</artifactId>
 				<version>${guice.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.google.inject.extensions</groupId>
-				<artifactId>guice-multibindings</artifactId>
-				<version>${guice.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>commons-cli</groupId>
 				<artifactId>commons-cli</artifactId>

diff --git a/sre/io.janusproject/io.janusproject.feature/feature.xml b/sre/io.janusproject/io.janusproject.feature/feature.xml
@@ -227,7 +227,6 @@
       <import plugin="io.sarl.api.bootiquebase" version="0.12.0" match="greaterOrEqual"/>
       <import plugin="io.bootique" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.arakhne.afc.bootique.variables" version="16.0.0" match="greaterOrEqual"/>
-      <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.15.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtend.lib" version="2.20.0" match="greaterOrEqual"/>
@@ -247,6 +246,7 @@
       <import plugin="org.eclipse.xtend.lib.macro"/>
       <import plugin="io.sarl.lang.core" version="0.12.0" match="greaterOrEqual"/>
       <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="com.google.inject" version="4.2.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -263,14 +263,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.google.inject.multibindings"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.arakhne.afc.core.util"
          download-size="0"

diff --git a/sre/io.janusproject/io.janusproject.feature/pom.xml b/sre/io.janusproject/io.janusproject.feature/pom.xml
@@ -28,7 +28,6 @@
 						<plugin id="com.google.gson"/>
 						<plugin id="com.google.guava"/>
 						<plugin id="com.google.inject"/>
-						<plugin id="com.google.inject.multibindings"/>
 						<plugin id="com.fasterxml.jackson.core.jackson-annotations"/>
 						<plugin id="com.fasterxml.jackson.core.jackson-core"/>
 						<plugin id="com.fasterxml.jackson.core.jackson-databind"/>

diff --git a/sre/io.janusproject/io.janusproject.kernel/pom.xml b/sre/io.janusproject/io.janusproject.kernel/pom.xml
@@ -39,12 +39,7 @@
 			<artifactId>guice</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.inject.extensions</groupId>
-			<artifactId>guice-multibindings</artifactId>
-		</dependency>
-
-		<!-- The following dependency is necessay to avoid version conflict
+		<!-- The following dependency is necessary to avoid version conflict
 		     between the SARL SDK and Guice. -->
 		<dependency>
 			<groupId>com.google.guava</groupId>

diff --git a/sre/io.janusproject/io.janusproject.network/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.network/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: io.sarl.core;bundle-version="0.12.0",
  io.bootique;bundle-version="1.0.0",
  org.arakhne.afc.bootique.log4j;bundle-version="16.0.0",
  org.arakhne.afc.bootique.variables;bundle-version="16.0.0",
- com.google.inject;bundle-version="4.1.0",
+ com.google.inject;bundle-version="4.2.3",
  com.hazelcast;bundle-version="4.0.0",
  io.janusproject.plugin;bundle-version="0.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: io.sarl.core;bundle-version="0.12.0",
  io.sarl.api.bootiquebase;bundle-version="0.12.0",
  io.bootique;bundle-version="1.0.0",
  org.arakhne.afc.bootique.variables;bundle-version="16.0.0",
- com.google.inject;bundle-version="4.1.0",
+ com.google.inject;bundle-version="4.2.3",
  javax.inject;bundle-version="1.0.0",
  org.eclipse.osgi;bundle-version="3.15.100",
  org.eclipse.xtend.lib;bundle-version="2.20.0",