Migrate off ancient Plexus components

To JSR330, and drop use of archived plexus-component-metadata plugin and replace it with sisu-maven-index.
quarkusio · Mar 20, 2023 · aa3be9e · aa3be9e
1 parent 203f3d9
commit aa3be9e
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 46 deletions.
diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml
@@ -49,12 +49,8 @@
             <artifactId>maven-plugin-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -172,16 +168,15 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-component-metadata</artifactId>
-                <version>2.1.0</version>
-                <configuration>
-                    <staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
-                </configuration>
+                <groupId>org.eclipse.sisu</groupId>
+                <artifactId>sisu-maven-plugin</artifactId>
+                <version>0.3.5</version>
                 <executions>
                     <execution>
+                        <id>index-project</id>
                         <goals>
-                            <goal>generate-metadata</goal>
+                            <goal>main-index</goal>
+                            <goal>test-index</goal>
                         </goals>
                     </execution>
                 </executions>

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java
@@ -31,7 +31,6 @@
 import io.quarkus.bootstrap.util.IoUtils;
 import io.quarkus.bootstrap.workspace.ArtifactSources;
 import io.quarkus.maven.dependency.ArtifactCoords;
-import io.quarkus.runtime.LaunchMode;
 
 /**
  * This goal downloads all the Maven artifact dependencies required to build, run, test and

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java
@@ -15,13 +15,15 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.impl.RemoteRepositoryManager;
 
@@ -45,21 +47,26 @@
 import io.quarkus.runtime.LaunchMode;
 import io.smallrye.common.expression.Expression;
 
-@Component(role = QuarkusBootstrapProvider.class, instantiationStrategy = "singleton")
+@Singleton
+@Named
 public class QuarkusBootstrapProvider implements Closeable {
 
     private static final String MANIFEST_SECTIONS_PROPERTY_PREFIX = "quarkus.package.manifest.manifest-sections";
     private static final String MANIFEST_ATTRIBUTES_PROPERTY_PREFIX = "quarkus.package.manifest.attributes";
 
-    @Requirement(role = RepositorySystem.class, optional = false)
-    protected RepositorySystem repoSystem;
+    private final RepositorySystem repoSystem;
 
-    @Requirement(role = RemoteRepositoryManager.class, optional = false)
-    protected RemoteRepositoryManager remoteRepoManager;
+    private final RemoteRepositoryManager remoteRepoManager;
 
     private final Cache<String, QuarkusMavenAppBootstrap> appBootstrapProviders = CacheBuilder.newBuilder()
             .concurrencyLevel(4).softValues().initialCapacity(10).build();
 
+    @Inject
+    public QuarkusBootstrapProvider(RepositorySystem repoSystem, RemoteRepositoryManager remoteRepoManager) {
+        this.repoSystem = repoSystem;
+        this.remoteRepoManager = remoteRepoManager;
+    }
+
     static ArtifactKey getProjectId(MavenProject project) {
         return ArtifactKey.ga(project.getGroupId(), project.getArtifactId());
     }

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/components/BootstrapSessionListener.java b/devtools/maven/src/main/java/io/quarkus/maven/components/BootstrapSessionListener.java
@@ -2,22 +2,29 @@
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.maven.AbstractMavenLifecycleParticipant;
 import org.apache.maven.MavenExecutionException;
 import org.apache.maven.execution.MavenSession;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 
 import io.quarkus.maven.QuarkusBootstrapProvider;
 
-@Component(role = AbstractMavenLifecycleParticipant.class, hint = "quarkus-bootstrap")
+@Singleton
+@Named("quarkus-bootstrap")
 public class BootstrapSessionListener extends AbstractMavenLifecycleParticipant {
 
-    @Requirement(optional = false)
-    protected QuarkusBootstrapProvider bootstrapProvider;
+    private final QuarkusBootstrapProvider bootstrapProvider;
 
     private boolean enabled;
 
+    @Inject
+    public BootstrapSessionListener(QuarkusBootstrapProvider bootstrapProvider) {
+        this.bootstrapProvider = bootstrapProvider;
+    }
+
     @Override
     public void afterSessionEnd(MavenSession session) throws MavenExecutionException {
         try {

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/components/MavenVersionEnforcer.java b/devtools/maven/src/main/java/io/quarkus/maven/components/MavenVersionEnforcer.java
@@ -5,14 +5,15 @@
 import java.util.List;
 import java.util.Properties;
 
+import javax.inject.Named;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.versioning.*;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.component.annotations.Component;
 
-@Component(role = MavenVersionEnforcer.class, instantiationStrategy = "per-lookup")
+@Named
 public class MavenVersionEnforcer {
 
     public void ensureMavenVersion(Log log, MavenSession session) throws MojoExecutionException {

diff --git a/independent-projects/bootstrap/maven-plugin/pom.xml b/independent-projects/bootstrap/maven-plugin/pom.xml
@@ -13,16 +13,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-component-metadata</artifactId>
-                <version>2.1.0</version>
-                <configuration>
-                    <staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
-                </configuration>
+                <groupId>org.eclipse.sisu</groupId>
+                <artifactId>sisu-maven-plugin</artifactId>
+                <version>0.3.5</version>
                 <executions>
                     <execution>
+                        <id>index-project</id>
                         <goals>
-                            <goal>generate-metadata</goal>
+                            <goal>main-index</goal>
+                            <goal>test-index</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -101,6 +100,10 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>

diff --git a/...cts/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java b/...cts/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java
@@ -3,15 +3,18 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.codehaus.plexus.component.annotations.Component;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 
-@Component(role = BootstrapWorkspaceProvider.class, instantiationStrategy = "singleton")
+@Singleton
+@Named
 public class BootstrapWorkspaceProvider {
 
     private final Path base;

diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
@@ -166,16 +166,15 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-component-metadata</artifactId>
-                <version>2.1.0</version>
-                <configuration>
-                    <staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
-                </configuration>
+                <groupId>org.eclipse.sisu</groupId>
+                <artifactId>sisu-maven-plugin</artifactId>
+                <version>0.3.5</version>
                 <executions>
                     <execution>
+                        <id>index-project</id>
                         <goals>
-                            <goal>generate-metadata</goal>
+                            <goal>main-index</goal>
+                            <goal>test-index</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -251,6 +250,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>

diff --git a/...cts/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java b/...cts/extension-maven-plugin/src/main/java/io/quarkus/maven/BootstrapWorkspaceProvider.java
@@ -3,15 +3,18 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import org.codehaus.plexus.component.annotations.Component;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
 
-@Component(role = BootstrapWorkspaceProvider.class, instantiationStrategy = "singleton")
+@Singleton
+@Named
 public class BootstrapWorkspaceProvider {
 
     private final Path base;