[MRELEASE-1096] migrate from Plexus to JSR-330/Sisu in tests/ITs

apache · Jun 4, 2022 · 2f5dfc7 · 2f5dfc7
1 parent 281b680
commit 2f5dfc7
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 73 deletions.
diff --git a/README.TXT b/README.TXT
diff --git a/maven-release-manager/src/test/resources/pomfinder/pom1.xml b/maven-release-manager/src/test/resources/pomfinder/pom1.xml
@@ -190,34 +190,6 @@
           </models>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>@plexusMavenPluginVersion@</version>
-        <executions>
-          <execution>
-            <id>create-component-descriptor</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>descriptor</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>merge</id>
-            <configuration>
-              <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
-              <descriptors>
-                <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
-                <descriptor>src/main/components-fragment.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>merge-descriptors</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml b/maven-release-plugin/src/it/setup/maven-project-naming-stub-policy/pom.xml
@@ -31,6 +31,11 @@
       <artifactId>maven-release-manager</artifactId>
       <version>@project.version@</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -44,14 +49,14 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <version>@plexusComponentMetadataVersion@</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>@sisuVersion@</version>
         <executions>
           <execution>
-            <id>process-classes</id>
+            <id>index-project</id>
             <goals>
-              <goal>generate-metadata</goal>
+              <goal>main-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/...ub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubNamingPolicy.java b/...ub-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubNamingPolicy.java
@@ -19,13 +19,15 @@
  * under the License.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.maven.shared.release.policy.naming.NamingPolicy;
 import org.apache.maven.shared.release.policy.naming.NamingPolicyRequest;
 import org.apache.maven.shared.release.policy.naming.NamingPolicyResult;
 
-import org.codehaus.plexus.component.annotations.Component;
-
-@Component( role = NamingPolicy.class, hint = "StubNamingPolicy" )
+@Singleton
+@Named( "StubNamingPolicy" )
 public final class StubNamingPolicy
     implements NamingPolicy
 {

diff --git a/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml b/maven-release-plugin/src/it/setup/maven-project-version-stub-policy/pom.xml
@@ -36,6 +36,11 @@
       <artifactId>maven-release-manager</artifactId>
       <version>@project.version@</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -49,14 +54,14 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-metadata</artifactId>
-        <version>@plexusComponentMetadataVersion@</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>@sisuVersion@</version>
         <executions>
           <execution>
-            <id>process-classes</id>
+            <id>index-project</id>
             <goals>
-              <goal>generate-metadata</goal>
+              <goal>main-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/...b-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubVersionPolicy.java b/...b-policy/src/main/java/org/apache/maven/shared/release/policy/stub/StubVersionPolicy.java
@@ -19,15 +19,18 @@
  * under the License.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.maven.shared.release.policy.version.VersionPolicy;
 import org.apache.maven.shared.release.policy.version.VersionPolicyRequest;
 import org.apache.maven.shared.release.policy.version.VersionPolicyResult;
-import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * A {@link VersionPolicy} implementation that switches continously between shapsnot and release version.
  */
-@Component( role = VersionPolicy.class, hint = "StubVersionPolicy" )
+@Singleton
+@Named( "StubVersionPolicy" )
 public final class StubVersionPolicy
     implements VersionPolicy
 {

diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml b/maven-release-plugin/src/it/setup/maven-scm-provider-dummy/pom.xml
@@ -34,6 +34,11 @@
       <artifactId>maven-scm-api</artifactId>
       <version>@scmVersion@</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -47,13 +52,15 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>@plexusMavenPluginVersion@</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>@sisuVersion@</version>
         <executions>
           <execution>
+            <id>index-project</id>
             <goals>
-              <goal>descriptor</goal>
+              <goal>main-index</goal>
+              <goal>test-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/...cm-provider-dummy/src/main/java/org/apache/maven/scm/provider/dummy/DummyScmProvider.java b/...cm-provider-dummy/src/main/java/org/apache/maven/scm/provider/dummy/DummyScmProvider.java
@@ -1,5 +1,8 @@
 package org.apache.maven.scm.provider.dummy;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -31,9 +34,10 @@
  * A dummy SCM provider used to bypass the {@code ScmCheckModificationsPhase} of the Release Plugin when doing a dry run
  * for integration testing.
  * 
- * @plexus.component role="org.apache.maven.scm.provider.ScmProvider" role-hint="dummy"
  * @author Benjamin Bentmann
  */
+@Singleton
+@Named( "dummy" )
 public class DummyScmProvider
     extends AbstractScmProvider
 {

diff --git a/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml b/maven-release-plugin/src/it/setup/maven-scm-provider-stub/pom.xml
@@ -36,6 +36,11 @@
       <artifactId>maven-scm-api</artifactId>
       <version>@scmVersion@</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -49,13 +54,14 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>@plexusMavenPluginVersion@</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>@sisuVersion@</version>
         <executions>
           <execution>
+            <id>index-project</id>
             <goals>
-              <goal>descriptor</goal>
+              <goal>main-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/...n-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java b/...n-scm-provider-stub/src/main/java/org/apache/maven/scm/provider/stub/StubScmProvider.java
@@ -1,5 +1,8 @@
 package org.apache.maven.scm.provider.stub;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -36,9 +39,10 @@
 /**
  * A stub SCM provider used for the Maven Release Plugin when doing integration testing.
  * 
- * @plexus.component role="org.apache.maven.scm.provider.ScmProvider" role-hint="stub"
  * @author Benjamin Bentmann
  */
+@Singleton
+@Named( "stub" )
 public class StubScmProvider
     extends AbstractScmProvider
 {

diff --git a/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml b/maven-release-plugin/src/it/setup/maven-wagon-provider-dummy/pom.xml
@@ -36,6 +36,11 @@
       <artifactId>wagon-provider-api</artifactId>
       <version>2.2</version>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -49,13 +54,15 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
-        <version>@plexusMavenPluginVersion@</version>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>@sisuVersion@</version>
         <executions>
           <execution>
+            <id>index-project</id>
             <goals>
-              <goal>descriptor</goal>
+              <goal>main-index</goal>
+              <goal>test-index</goal>
             </goals>
           </execution>
         </executions>

diff --git a/...ovider-dummy/src/main/java/org/apache/maven/wagon/providers/dummy/DummyWagonProvider.java b/...ovider-dummy/src/main/java/org/apache/maven/wagon/providers/dummy/DummyWagonProvider.java
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.util.List;
 
+import javax.inject.Named;
+
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
@@ -39,9 +41,8 @@
  * DummyWagonProvider which does absolutely nothing
  * 
  * @author Robert Scholte
- * 
- * @plexus.component role="org.apache.maven.wagon.Wagon" role-hint="dummy" instantiation-strategy="per-lookup"
  */
+@Named( "dummy" )
 public class DummyWagonProvider implements Wagon
 {
 

diff --git a/pom.xml b/pom.xml
@@ -103,9 +103,6 @@
 
     <mavenCompilerPluginVersion>3.10.1</mavenCompilerPluginVersion>
     <mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
-
-    <plexusComponentMetadataVersion>1.7.1</plexusComponentMetadataVersion>
-    <plexusMavenPluginVersion>1.3.8</plexusMavenPluginVersion>
   </properties>
 
   <build>