Migrate from deprecated Plexus Components to non-deprecated JSR 330 (#…

…491)
jenkinsci · May 22, 2023 · 7470269 · 7470269
1 parent f9288ae
commit 7470269
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,6 @@
     <!-- if we update this all consumers need to be running at least this version -->
     <maven.version>3.8.1</maven.version>
     <maven-plugin-tools.version>3.9.0</maven-plugin-tools.version>
-    <plexus-containers.version>2.1.1</plexus-containers.version>
     <aether.version>1.1.0</aether.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
@@ -109,6 +108,11 @@
         <artifactId>plexus-archiver</artifactId>
         <version>4.7.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
+        <version>2.1.1</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-io</artifactId>
@@ -159,6 +163,11 @@
       <artifactId>support-log-formatter</artifactId>
       <version>1.2</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
     <dependency>
       <groupId>net.java.sezpoz</groupId>
       <artifactId>sezpoz</artifactId>
@@ -189,11 +198,6 @@
       <artifactId>maven-filtering</artifactId>
       <version>3.3.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-annotations</artifactId>
-      <version>${plexus-containers.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
@@ -404,13 +408,14 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <version>${plexus-containers.version}</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>0.3.5</version>
         <executions>
           <execution>
+            <id>generate-index</id>
             <goals>
-              <goal>generate-metadata</goal>
+              <goal>main-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/src/main/java/org/jenkinsci/maven/plugins/hpi/PluginWorkspaceMapImpl.java b/src/main/java/org/jenkinsci/maven/plugins/hpi/PluginWorkspaceMapImpl.java
@@ -9,15 +9,17 @@
 import java.io.OutputStream;
 import java.util.Map;
 import java.util.Properties;
-import org.codehaus.plexus.component.annotations.Component;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 /**
  * Default and currently the only implementation of {@link PluginWorkspaceMap}
  *
  * @author Jesse Glick
  * @author Kohsuke Kawaguchi
  */
-@Component(role = PluginWorkspaceMap.class)
+@Named
+@Singleton
 public class PluginWorkspaceMapImpl implements PluginWorkspaceMap {
     private final File mapFile;