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.

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

In a Mojo we can directly use @Inject - Sisu will do all work for us #710

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,19 @@
* under the License.
*/

import javax.inject.Inject;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter;
import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter;
import org.codehaus.mojo.versions.utils.DependencyBuilder;
Expand Down Expand Up @@ -144,16 +137,6 @@ public abstract class AbstractVersionsDependencyUpdaterMojo
@Parameter( property = "excludeReactor", defaultValue = "true" )
private boolean excludeReactor;

@Inject
protected AbstractVersionsDependencyUpdaterMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver )
{
super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
}

/**
* Should the project/dependencies section of the pom be processed.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
* under the License.
*/

import javax.inject.Inject;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -29,12 +27,7 @@
import java.util.Set;

import org.apache.commons.lang3.StringUtils;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.repository.RepositorySystem;

/**
* Abstract base class for the Display___ mojos.
Expand Down Expand Up @@ -83,16 +76,6 @@ public abstract class AbstractVersionsDisplayMojo

private boolean outputFileError = false;

@Inject
protected AbstractVersionsDisplayMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver )
{
super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
}

protected void logInit()
{
if ( outputFile != null && !outputFileError )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ public abstract class AbstractVersionsReport
*
* @since 1.0-alpha-3
*/
@Inject
protected I18N i18n;

@Inject
protected RepositorySystem repositorySystem;

/**
Expand All @@ -82,6 +84,7 @@ public abstract class AbstractVersionsReport
*
* @since 1.0-alpha-1
*/
@Inject
protected ArtifactMetadataSource artifactMetadataSource;

/**
Expand All @@ -99,6 +102,7 @@ public abstract class AbstractVersionsReport
/**
* @since 1.0-alpha-3
*/
@Inject
private WagonManager wagonManager;

/**
Expand Down Expand Up @@ -159,6 +163,7 @@ public abstract class AbstractVersionsReport
@Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true )
private MojoExecution mojoExecution;

@Inject
protected ArtifactResolver artifactResolver;

/**
Expand Down Expand Up @@ -188,19 +193,6 @@ public abstract class AbstractVersionsReport
@Parameter( property = "maven.version.ignore" )
protected Set<String> ignoredVersions;

// --------------------- GETTER / SETTER METHODS ---------------------

@Inject
protected AbstractVersionsReport( I18N i18n, RepositorySystem repositorySystem, ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, WagonManager wagonManager )
{
this.i18n = i18n;
this.repositorySystem = repositorySystem;
this.artifactResolver = artifactResolver;
this.artifactMetadataSource = artifactMetadataSource;
this.wagonManager = wagonManager;
}

public VersionsHelper getHelper()
throws MavenReportException
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,13 @@ public abstract class AbstractVersionsUpdaterMojo
@Parameter( defaultValue = "${project}", required = true, readonly = true )
protected MavenProject project;

@Inject
protected RepositorySystem repositorySystem;

/**
* @since 1.0-alpha-1
*/
@Inject
protected MavenProjectBuilder projectBuilder;

/**
Expand All @@ -113,6 +115,7 @@ public abstract class AbstractVersionsUpdaterMojo
*
* @since 1.0-alpha-1
*/
@Inject
protected ArtifactMetadataSource artifactMetadataSource;

/**
Expand All @@ -136,6 +139,7 @@ public abstract class AbstractVersionsUpdaterMojo
/**
* @since 1.0-alpha-3
*/
@Inject
private WagonManager wagonManager;

/**
Expand Down Expand Up @@ -194,7 +198,9 @@ public abstract class AbstractVersionsUpdaterMojo
@Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true )
private MojoExecution mojoExecution;

@Inject
protected ArtifactResolver artifactResolver;

/**
* The format used to record changes. If "none" is specified, no changes are recorded.
*
Expand Down Expand Up @@ -245,20 +251,6 @@ public abstract class AbstractVersionsUpdaterMojo

// --------------------- GETTER / SETTER METHODS ---------------------

@Inject
protected AbstractVersionsUpdaterMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver )
{
this.repositorySystem = repositorySystem;
this.projectBuilder = projectBuilder;
this.artifactMetadataSource = artifactMetadataSource;
this.wagonManager = wagonManager;
this.artifactResolver = artifactResolver;
}

public VersionsHelper getHelper() throws MojoExecutionException
{
if ( helper == null )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
import java.util.Map;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
Expand All @@ -43,7 +40,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.mojo.versions.api.ArtifactAssociation;
import org.codehaus.mojo.versions.api.PomHelper;
import org.codehaus.mojo.versions.api.PropertyVersions;
Expand Down Expand Up @@ -116,21 +112,8 @@ public class CompareDependenciesMojo
/**
* The project builder used to initialize the remote project.
*/
protected MavenProjectBuilder mavenProjectBuilder;

// ------------------------------ METHODS --------------------------

@Inject
public CompareDependenciesMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver,
MavenProjectBuilder mavenProjectBuilder )
{
super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
this.mavenProjectBuilder = mavenProjectBuilder;
}
protected MavenProjectBuilder mavenProjectBuilder;

/**
* @param pom the pom to update.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,21 @@
* under the License.
*/

import javax.inject.Inject;

import java.io.File;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;

import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.mojo.versions.api.ArtifactVersions;
import org.codehaus.mojo.versions.utils.DependencyComparator;
import org.codehaus.plexus.i18n.I18N;

import static java.util.Collections.emptyMap;
import static org.codehaus.mojo.versions.utils.MiscUtils.filter;
Expand Down Expand Up @@ -100,13 +93,6 @@ public class DependencyUpdatesReport extends AbstractVersionsReport
@Parameter( property = "onlyUpgradable", defaultValue = "false" )
protected boolean onlyUpgradable;

@Inject
protected DependencyUpdatesReport( I18N i18n, RepositorySystem repositorySystem, ArtifactResolver artifactResolver,
ArtifactMetadataSource artifactMetadataSource, WagonManager wagonManager )
{
super( i18n, repositorySystem, artifactResolver, artifactMetadataSource, wagonManager );
}

/**
* {@inheritDoc}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
* under the License.
*/

import javax.inject.Inject;
import javax.xml.stream.XMLStreamException;

import java.util.ArrayList;
Expand All @@ -32,10 +31,7 @@
import java.util.stream.Collectors;

import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
Expand All @@ -46,8 +42,6 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.mojo.versions.api.ArtifactVersions;
import org.codehaus.mojo.versions.api.Segment;
import org.codehaus.mojo.versions.filtering.DependencyFilter;
Expand Down Expand Up @@ -341,18 +335,6 @@ public class DisplayDependencyUpdatesMojo
@Parameter( property = "pluginManagementDependencyExcludes" )
private List<String> pluginManagementDependencyExcludes;

// --------------------- GETTER / SETTER METHODS ---------------------

@Inject
public DisplayDependencyUpdatesMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver )
{
super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
}

private static Set<Dependency> extractPluginDependenciesFromPluginsInPluginManagement( Build build )
{
Set<Dependency> result = new TreeSet<>( new DependencyComparator() );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,16 @@
* under the License.
*/

import javax.inject.Inject;
import javax.xml.stream.XMLStreamException;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.repository.RepositorySystem;
import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
import org.codehaus.mojo.versions.utils.DependencyBuilder;

Expand All @@ -51,16 +45,6 @@ public class DisplayParentUpdatesMojo

public static final int MESSAGE_LENGTH = 68;

@Inject
public DisplayParentUpdatesMojo( RepositorySystem repositorySystem,
MavenProjectBuilder projectBuilder,
ArtifactMetadataSource artifactMetadataSource,
WagonManager wagonManager,
ArtifactResolver artifactResolver )
{
super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
}

@Override
public void execute()
throws MojoExecutionException, MojoFailureException
Expand Down