Use Sisu/Guice directly for archetype component lookup

to replace plexus container.

Co-authored-by: Hannes Wellmann <[email protected]>

Author: laeubi

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/archetype/ArchetypePlugin.java

@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -34,22 +35,28 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.TypeLiteral;
+import com.google.inject.util.Modules;
+import com.google.inject.util.Types;
 
+import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.sisu.space.BeanScanning;
+import org.eclipse.sisu.space.BundleClassSpace;
+import org.eclipse.sisu.space.ClassSpace;
+import org.eclipse.sisu.space.SpaceModule;
+import org.eclipse.sisu.wire.WireModule;
 
-import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.classworlds.ClassWorld;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.logging.LogEnabled;
 
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.archetype.catalog.Archetype;
@@ -59,6 +66,7 @@
 import org.apache.maven.archetype.metadata.RequiredProperty;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.archetype.source.ArchetypeDataSourceException;
+import org.apache.maven.cli.logging.Slf4jLogger;
 
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.embedder.IMavenExecutionContext;
@@ -95,30 +103,42 @@ public class ArchetypePlugin {
 
   private Map<String, ArchetypeDataSource> archetypeDataSourceMap;
 
-  private DefaultPlexusContainer container;
-
   public ArchetypePlugin() {
     this.configFile = new File(MavenPluginActivator.getDefault().getStateLocation().toFile(),
         M2EUIPluginActivator.PREFS_ARCHETYPES);
     this.writer = new ArchetypeCatalogsWriter();
   }
 
   @Activate
-  void activate() throws PlexusContainerException, ComponentLookupException {
-    final Module logginModule = new AbstractModule() {
+  void activate() {
+    ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
+    Module localBindings = new AbstractModule() {
       @Override
       protected void configure() {
-        bind(ILoggerFactory.class).toInstance(LoggerFactory.getILoggerFactory());
+        bind(ILoggerFactory.class).toInstance(loggerFactory);
+        try {
+          bind(RepositorySystem.class).toInstance(MavenPluginActivator.getDefault().getRepositorySystem());
+        } catch(CoreException ex) {
+          ex.printStackTrace();
+        }
       }
     };
-    final ContainerConfiguration cc = new DefaultContainerConfiguration() //
-        .setClassWorld(new ClassWorld("plexus.core", ArchetypeArtifactManager.class.getClassLoader())) //$NON-NLS-1$
-        .setClassPathScanning(PlexusConstants.SCANNING_INDEX) //
-        .setAutoWiring(true) //
-        .setName("plexus"); //$NON-NLS-1$
-    container = new DefaultPlexusContainer(cc, logginModule);
-    archetypeArtifactManager = container.lookup(ArchetypeArtifactManager.class);
-    archetypeDataSourceMap = container.lookupMap(ArchetypeDataSource.class);
+    ClassSpace space = new BundleClassSpace(FrameworkUtil.getBundle(ArchetypeArtifactManager.class));
+    WireModule wireModule = new WireModule(new SpaceModule(space, BeanScanning.INDEX, false));
+    Injector injector = Guice.createInjector(Modules.override(wireModule).with(localBindings));
+    @SuppressWarnings("unchecked")
+    TypeLiteral<Map<String, ArchetypeDataSource>> mapOfDataSourcesType = (TypeLiteral<Map<String, ArchetypeDataSource>>) TypeLiteral
+        .get(Types.mapOf(String.class, ArchetypeDataSource.class));
+    archetypeArtifactManager = injector.getInstance(ArchetypeArtifactManager.class);
+    archetypeDataSourceMap = injector.getInstance(Key.get(mapOfDataSourcesType));
+
+    Slf4jLogger logger = new Slf4jLogger(LoggerFactory.getILoggerFactory().getLogger("catalog"));
+    if(archetypeArtifactManager instanceof LogEnabled logEnabled) {
+      logEnabled.enableLogging(logger);
+    }
+    archetypeDataSourceMap.values().stream().filter(LogEnabled.class::isInstance).map(LogEnabled.class::cast)
+        .forEach(d -> d.enableLogging(logger));
+
     addArchetypeCatalogFactory(
         new ArchetypeCatalogFactory.InternalCatalogFactory(archetypeDataSourceMap.get("internal-catalog")));
     addArchetypeCatalogFactory(
@@ -136,7 +156,6 @@ protected void configure() {
   @Deactivate
   void shutdown() throws IOException {
     saveCatalogs();
-    container.dispose();
   }
 
   public LocalCatalogFactory newLocalCatalogFactory(String path, String description, boolean editable,

org.eclipse.m2e.maven.runtime/pom.xml

@@ -21,7 +21,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.900-SNAPSHOT</version>
+	<version>3.9.901-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
@@ -140,7 +140,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.16</version>
+			<version>2.0.17</version><!--$NO-MVN-MAN-VER$-->
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -202,8 +202,10 @@
 								org.slf4j.*;version="[1.7.31,3.0.0)",\
 								javax.inject;version="[1.0.0,2.0.0)",\
 								javax.annotation;version="[1.2.0,2.0.0)", \
-								org.apache.commons.cli;version="[1.4.0,2.0.0)", \
-								org.apache.commons.codec*
+								org.apache.commons.cli;version="[1.4.0,2.0.0)",\
+								org.apache.commons.codec*,\
+								org.osgi.*,\
+							
 							Require-Bundle: \
 								com.google.guava;bundle-version="32.2.1"
 

pom.xml

@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.900-SNAPSHOT</version>
+			<version>3.9.901-SNAPSHOT</version>
 		</dependency>
 	</dependencies>