You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/10/06 19:58:10 UTC

[maven-stage-plugin] 01/01: Replace doclettags with annotations

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch stabilize
in repository https://gitbox.apache.org/repos/asf/maven-stage-plugin.git

commit d436083e88258c01a127ad7e9fe0a274ff8df302
Author: rfscholte <rf...@apache.org>
AuthorDate: Wed Oct 6 21:57:57 2021 +0200

    Replace doclettags with annotations
---
 pom.xml                                                 | 17 +++++++++++++++++
 .../maven/plugins/stage/DefaultRepositoryCopier.java    |  6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c09f110..651ae6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,11 @@ under the License.
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <version>${wagonVersion}</version>
@@ -150,6 +155,18 @@ under the License.
     </pluginManagement>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-metadata</goal>
+              <goal>generate-test-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
index 9ce897f..8b65ca6 100644
--- a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
+++ b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
@@ -36,6 +36,8 @@ import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
@@ -64,8 +66,8 @@ import java.util.zip.ZipOutputStream;
 
 /**
  * @author Jason van Zyl
- * @plexus.component
  */
+@Component( role = RepositoryCopier.class )
 public class DefaultRepositoryCopier
     implements LogEnabled, RepositoryCopier
 {
@@ -73,7 +75,7 @@ public class DefaultRepositoryCopier
 
     private MetadataXpp3Writer writer = new MetadataXpp3Writer();
 
-    /** @plexus.requirement */
+    @Requirement
     private WagonManager wagonManager;
 
     private Logger logger;