Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MDEP-966] @Component to @Inject for ListClassesMojo and ListRepositoriesMojo #475

Merged
merged 12 commits into from
Nov 18, 2024
Merged

[MDEP-966] @Component to @Inject for ListClassesMojo and ListRepositoriesMojo #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23c9cd0
@Component to @Inject for ListClassesMojo
elharo Nov 17, 2024
c5b41d9
spotless
elharo Nov 17, 2024
53f7080
ListRepositoriesMojo
elharo Nov 17, 2024
2197cfa
spotless
elharo Nov 17, 2024
8519bab
PropertiesMojo
elharo Nov 17, 2024
eb51274
AnalyzeReport
elharo Nov 18, 2024
61cee35
AnalyzeDuplicateMojo
elharo Nov 18, 2024
915f4fe
merge with master
elharo Nov 18, 2024
d374f25
pom
elharo Nov 18, 2024
a59cb31
dependency
elharo Nov 18, 2024
b7533de
Merge branch 'master' into inject4
elharo Nov 18, 2024
5e95cab
fix accidental confusion between two branches
elharo Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/org/apache/maven/plugins/dependency/ListClassesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.dependency;

import javax.inject.Inject;

import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
Expand All @@ -28,7 +30,6 @@
import org.apache.maven.plugin.AbstractMojo;
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.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.dependency.utils.ParamArtifact;
Expand All @@ -45,11 +46,15 @@
@Mojo(name = "list-classes", requiresProject = false, threadSafe = true)
public class ListClassesMojo extends AbstractMojo {

@Component
private ResolverUtil resolverUtil;

private ParamArtifact paramArtifact = new ParamArtifact();

@Inject
public ListClassesMojo(ResolverUtil resolverUtil) {
this.resolverUtil = resolverUtil;
}

/**
* The group ID of the artifact to download. Ignored if {@code artifact} is used.
*
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.dependency;

import javax.inject.Inject;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -31,7 +33,6 @@
import org.apache.maven.RepositoryUtils;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
Expand All @@ -53,9 +54,13 @@
@Mojo(name = "list-repositories", threadSafe = true)
public class ListRepositoriesMojo extends AbstractDependencyMojo {

@Component
private RepositorySystem repositorySystem;

@Inject
public ListRepositoriesMojo(RepositorySystem repositorySystem) {
this.repositorySystem = repositorySystem;
}

/**
* Displays a list of the repositories used by this build.
*
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeDuplicateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.apache.maven.plugins.dependency.analyze;

import javax.inject.Inject;

import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
Expand All @@ -34,7 +36,6 @@
import org.apache.maven.plugin.AbstractMojo;
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.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
Expand Down Expand Up @@ -66,9 +67,13 @@ public class AnalyzeDuplicateMojo extends AbstractMojo {
/**
* The Maven project to analyze.
*/
@Component
private MavenProject project;

@Inject
public AnalyzeDuplicateMojo(MavenProject project) {
this.project = project;
}

/**
* {@inheritDoc}
*/
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
*/
package org.apache.maven.plugins.dependency.analyze;

import javax.inject.Inject;

import java.util.Locale;
import java.util.Set;

import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Execute;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
Expand All @@ -48,7 +49,6 @@ public class AnalyzeReport extends AbstractMavenReport {
/**
* The Maven project dependency analyzer to use.
*/
@Component
private ProjectDependencyAnalyzer analyzer;

/**
Expand Down Expand Up @@ -87,9 +87,14 @@ public class AnalyzeReport extends AbstractMavenReport {
/**
* Internationalization component
*/
@Component
private I18N i18n;

@Inject
public AnalyzeReport(ProjectDependencyAnalyzer analyzer, I18N i18n) {
this.analyzer = analyzer;
this.i18n = i18n;
}

// Mojo methods -----------------------------------------------------------

/*
Expand Down Expand Up @@ -142,11 +147,13 @@ public String getOutputName() {
}

/** {@inheritDoc} */
@Override
public String getName(Locale locale) {
return getI18nString(locale, "name");
}

/** {@inheritDoc} */
@Override
public String getDescription(Locale locale) {
return getI18nString(locale, "description");
}
Expand Down