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
commit e7812a4104e4b3f17ddd726ca6c9ab5140e925bc Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Mon Nov 18 10:35:37 2024 -0500 Migrate from Plexus to Guice --- pom.xml | 5 +++++ .../java/org/apache/maven/plugins/ear/EarMojo.java | 23 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index d8dbe66..0d55398 100644 --- a/pom.xml +++ b/pom.xml @@ -165,6 +165,11 @@ <artifactId>maven-shared-utils</artifactId> <version>3.4.2</version> </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> 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 cbf8b46..9994dc7 100644 --- a/src/main/java/org/apache/maven/plugins/ear/EarMojo.java +++ b/src/main/java/org/apache/maven/plugins/ear/EarMojo.java @@ -18,6 +18,8 @@ */ package org.apache.maven.plugins.ear; +import javax.inject.Inject; + import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -264,24 +266,16 @@ public class EarMojo extends AbstractEarMojo { @Parameter(defaultValue = "${project.build.outputTimestamp}") private String outputTimestamp; - /** - */ - @Component private MavenProjectHelper projectHelper; /** * The archive manager. */ - @Component private ArchiverManager archiverManager; - /** - */ @Component(role = MavenFileFilter.class, hint = "default") private MavenFileFilter mavenFileFilter; - /** - */ @Component(role = MavenResourcesFiltering.class, hint = "default") private MavenResourcesFiltering mavenResourcesFiltering; @@ -293,7 +287,20 @@ public class EarMojo extends AbstractEarMojo { private List<FilterWrapper> filterWrappers; + @Inject + public EarMojo( + MavenProjectHelper projectHelper, + ArchiverManager archiverManager, + MavenFileFilter mavenFileFilter, + MavenResourcesFiltering mavenResourcesFiltering) { + this.projectHelper = projectHelper; + this.archiverManager = archiverManager; + this.mavenFileFilter = mavenFileFilter; + this.mavenResourcesFiltering = mavenResourcesFiltering; + } + /** {@inheritDoc} */ + @Override public void execute() throws MojoExecutionException, MojoFailureException { // Initializes ear modules super.execute();