(maven-ear-plugin) branch guice updated: Migrate from Plexus to Guice

[elharo]

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

elharo pushed a commit to branch guice
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git


The following commit(s) were added to refs/heads/guice by this push:
     new 0a743a6  Migrate from Plexus to Guice
0a743a6 is described below

commit 0a743a61a0ebf10c2e6de6629443235728b81e3b
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Mon Nov 18 10:37:48 2024 -0500

    Migrate from Plexus to Guice
---
 src/main/java/org/apache/maven/plugins/ear/EarMojo.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java 
b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
index 9994dc7..b9d4814 100644
--- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
@@ -51,7 +51,6 @@ import 
org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -66,7 +65,6 @@ import 
org.apache.maven.shared.filtering.MavenResourcesExecution;
 import org.apache.maven.shared.filtering.MavenResourcesFiltering;
 import org.apache.maven.shared.mapping.MappingUtils;
 import org.apache.maven.shared.utils.io.FileUtils;
-import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.ear.EarArchiver;
@@ -240,13 +238,11 @@ public class EarMojo extends AbstractEarMojo {
     /**
      * The Plexus EAR archiver to create the output archive.
      */
-    @Component(role = Archiver.class, hint = "ear")
     private EarArchiver earArchiver;
 
     /**
-     * The Plexus JAR archiver to create the output archive if not EAR 
application descriptor is provided (JavaEE 5+).
+     * The Plexus JAR archiver to create the output archive if no EAR 
application descriptor is provided (JavaEE 5+).
      */
-    @Component(role = Archiver.class, hint = "jar")
     private JarArchiver jarArchiver;
 
     /**
@@ -273,10 +269,8 @@ public class EarMojo extends AbstractEarMojo {
      */
     private ArchiverManager archiverManager;
 
-    @Component(role = MavenFileFilter.class, hint = "default")
     private MavenFileFilter mavenFileFilter;
 
-    @Component(role = MavenResourcesFiltering.class, hint = "default")
     private MavenResourcesFiltering mavenResourcesFiltering;
 
     /**
@@ -289,10 +283,14 @@ public class EarMojo extends AbstractEarMojo {
 
     @Inject
     public EarMojo(
+            EarArchiver earArchiver,
+            JarArchiver jarArchiver,
             MavenProjectHelper projectHelper,
             ArchiverManager archiverManager,
             MavenFileFilter mavenFileFilter,
             MavenResourcesFiltering mavenResourcesFiltering) {
+        this.earArchiver = earArchiver;
+        this.jarArchiver = jarArchiver;
         this.projectHelper = projectHelper;
         this.archiverManager = archiverManager;
         this.mavenFileFilter = mavenFileFilter;