[all] Replace Guice by Guice NO-AOP

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

Hide file tree

Showing 11 changed files with 5 additions and 26 deletions.
diff --git a/docs/io.sarl.docs.doclet/pom.xml b/docs/io.sarl.docs.doclet/pom.xml
@@ -41,6 +41,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
+			<classifier>no_aop</classifier>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>

diff --git a/main/features/io.sarl.baseplatform.dsl/feature.xml b/main/features/io.sarl.baseplatform.dsl/feature.xml
@@ -356,13 +356,6 @@ for the SARL DSL Environment
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="aopalliance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.arakhne.afc.core.vmutils"
          download-size="0"

diff --git a/main/features/io.sarl.baseplatform/feature.xml b/main/features/io.sarl.baseplatform/feature.xml
@@ -616,11 +616,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="aopalliance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/main/internalmaven/io.sarl.maven.baselib/pom.xml b/main/internalmaven/io.sarl.maven.baselib/pom.xml
@@ -37,6 +37,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
+			<classifier>no_aop</classifier>
 		</dependency>
 		<!-- Force the version of ASM -->
 		<dependency>

diff --git a/main/internalmaven/sarl-maven-plugin/pom.xml b/main/internalmaven/sarl-maven-plugin/pom.xml
@@ -54,6 +54,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
+			<classifier>no_aop</classifier>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>

diff --git a/pom.xml b/pom.xml
@@ -488,6 +488,7 @@
 				<groupId>com.google.inject</groupId>
 				<artifactId>guice</artifactId>
 				<version>${guice.version}</version>
+				<classifier>no_aop</classifier>
 			</dependency>
 			<dependency>
 				<groupId>commons-cli</groupId>

diff --git a/...o.janusproject.eclipse/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java b/...o.janusproject.eclipse/src/io/janusproject/eclipse/buildpath/JanusClasspathContainer.java
@@ -69,13 +69,11 @@ public class JanusClasspathContainer extends AbstractSARLBasedClasspathContainer
 			//
 			// List of plugins that are included into the Janus feature for running Janus into Eclipse
 			//
-			"aopalliance", //$NON-NLS-1$
 			"com.fasterxml.jackson.core.jackson-core", //$NON-NLS-1$
 			"com.fasterxml.jackson.core.jackson-databind", //$NON-NLS-1$
 			"com.fasterxml.jackson.dataformat.jackson-dataformat-xml", //$NON-NLS-1$
 			"com.fasterxml.jackson.dataformat.jackson-dataformat-yaml", //$NON-NLS-1$
 			"com.fasterxml.jackson.module.jackson-module-jaxb-annotations", //$NON-NLS-1$
-			"com.google.inject.multibindings", //$NON-NLS-1$
 			"net.sf.jopt-simple.jopt-simple", //$NON-NLS-1$
 		};
 		final String[] array = new String[SARLClasspathContainer.SARL_ROOT_BUNDLE_NAMES.length + array1.length];

diff --git a/sre/io.janusproject/io.janusproject.feature/feature.xml b/sre/io.janusproject/io.janusproject.feature/feature.xml
@@ -256,13 +256,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="aopalliance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         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
@@ -18,7 +18,6 @@
 				<artifactId>tycho-source-feature-plugin</artifactId>
 				<configuration>
 					<excludes>
-						<plugin id="aopalliance"/>
 						<plugin id="org.apache.commons.cli"/>
 						<plugin id="org.arakhne.afc.core.util"/>
 						<plugin id="org.arakhne.afc.core.vmutils"/>

diff --git a/sre/io.janusproject/io.janusproject.kernel/pom.xml b/sre/io.janusproject/io.janusproject.kernel/pom.xml
@@ -37,6 +37,7 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
+			<classifier>no_aop</classifier>
 		</dependency>
 
 		<!-- The following dependency is necessary to avoid version conflict

diff --git a/...io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/buildpath/SARLClasspathContainerTest.java b/...io.sarl.eclipse.tests/src/io/sarl/eclipse/tests/buildpath/SARLClasspathContainerTest.java
@@ -94,10 +94,8 @@ public void getBundleDependencies_withEclipse() {
 		Iterable<String> iterable = this.container.getBundleDependencies();
 		assertNotNull(iterable);
 		assertPartlyContains(iterable,
-			"aopalliance",
 			"com.google.guava",
 			"com.google.inject",
-			"com.google.inject.multibindings",
 			"io.sarl.core",
 			"io.sarl.lang.core",
 			"io.sarl.util",