From 2ec383d8e30b5f5286ebb58986a3a91b5f1ed52c Mon Sep 17 00:00:00 2001 From: Andrzej Jarmoniuk Date: Thu, 24 Nov 2022 18:34:53 +0100 Subject: [PATCH] #704: Removing ArtifactResolver --- .../versions/api/DefaultVersionsHelper.java | 72 ++++++------------- .../mojo/versions/api/VersionsHelper.java | 6 +- .../api/DefaultVersionsHelperTest.java | 8 --- ...AbstractVersionsDependencyUpdaterMojo.java | 5 +- .../versions/AbstractVersionsDisplayMojo.java | 5 +- .../mojo/versions/AbstractVersionsReport.java | 15 ---- .../versions/AbstractVersionsUpdaterMojo.java | 43 +---------- .../versions/CompareDependenciesMojo.java | 9 ++- .../versions/DependencyUpdatesReportMojo.java | 4 +- .../DisplayDependencyUpdatesMojo.java | 5 +- .../versions/DisplayParentUpdatesMojo.java | 5 +- .../versions/DisplayPluginUpdatesMojo.java | 13 ++-- .../versions/DisplayPropertyUpdatesMojo.java | 5 +- .../mojo/versions/ForceReleasesMojo.java | 9 +-- .../mojo/versions/LockSnapshotsMojo.java | 16 +++-- .../versions/ParentUpdatesReportMojo.java | 4 +- .../versions/PluginUpdatesReportMojo.java | 4 +- .../versions/PropertyUpdatesReportMojo.java | 4 +- .../mojo/versions/ResolveRangesMojo.java | 5 +- .../org/codehaus/mojo/versions/SetMojo.java | 10 ++- .../mojo/versions/SetPropertyMojo.java | 11 ++- .../codehaus/mojo/versions/SetScmTagMojo.java | 5 +- .../mojo/versions/UnlockSnapshotsMojo.java | 5 +- .../mojo/versions/UpdateChildModulesMojo.java | 5 +- .../mojo/versions/UpdateParentMojo.java | 5 +- .../mojo/versions/UpdatePropertiesMojo.java | 5 +- .../mojo/versions/UpdatePropertyMojo.java | 5 +- .../mojo/versions/UseDepVersionMojo.java | 5 +- .../mojo/versions/UseLatestReleasesMojo.java | 5 +- .../mojo/versions/UseLatestSnapshotsMojo.java | 5 +- .../mojo/versions/UseLatestVersionsMojo.java | 7 +- .../versions/UseLatestVersionsMojoBase.java | 5 +- .../mojo/versions/UseNextReleasesMojo.java | 9 +-- .../mojo/versions/UseNextSnapshotsMojo.java | 5 +- .../mojo/versions/UseNextVersionsMojo.java | 9 +-- .../mojo/versions/UseReactorMojo.java | 5 +- .../mojo/versions/UseReleasesMojo.java | 5 +- .../DependencyUpdatesReportMojoTest.java | 2 +- .../DisplayDependencyUpdatesMojoTest.java | 7 -- .../mojo/versions/ForceReleasesMojoTest.java | 7 +- .../versions/ParentUpdatesReportMojoTest.java | 2 +- .../versions/PluginUpdatesReportMojoTest.java | 2 +- ...ratePatternsForIncludesAnExcludesTest.java | 2 +- .../codehaus/mojo/versions/SetMojoTest.java | 13 ++-- .../mojo/versions/UpdateParentMojoTest.java | 3 +- .../UpdatePropertiesMojoTestBase.java | 2 - .../versions/UseLatestReleasesMojoTest.java | 1 - .../versions/UseLatestVersionsMojoTest.java | 1 - .../mojo/versions/UseReleasesMojoTest.java | 3 - .../mojo/versions/utils/MockUtils.java | 2 - 50 files changed, 99 insertions(+), 296 deletions(-) diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java index 1ee58570b6..01dac5fa21 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java @@ -47,14 +47,10 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.execution.MavenSession; @@ -89,9 +85,12 @@ import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.eclipse.aether.resolution.ArtifactRequest; import org.eclipse.aether.resolution.VersionRangeRequest; import org.eclipse.aether.resolution.VersionRangeResolutionException; +import static org.apache.maven.RepositoryUtils.toArtifact; + /** * Helper class that provides common functionality required by both the mojos and the reports. * @@ -116,13 +115,6 @@ public class DefaultVersionsHelper */ private RuleSet ruleSet; - /** - * The local repository to consult. - * - * @since 1.0-alpha-3 - */ - private ArtifactRepository localRepository; - private RepositorySystem repositorySystem; private org.eclipse.aether.RepositorySystem aetherRepositorySystem; @@ -141,13 +133,6 @@ public class DefaultVersionsHelper */ private MavenSession mavenSession; - /** - * The artifact resolver. - * - * @since 1.3 - */ - private ArtifactResolver artifactResolver; - private MojoExecution mojoExecution; /** @@ -383,7 +368,7 @@ public ArtifactVersions lookupArtifactVersions( Artifact artifact, boolean usePl return new ArtifactVersions( artifact, aetherRepositorySystem.resolveVersionRange( mavenSession.getRepositorySession(), new VersionRangeRequest( - RepositoryUtils.toArtifact( artifact ).setVersion( "(,)" ), + toArtifact( artifact ).setVersion( "(,)" ), usePluginRepositories ? mavenSession.getCurrentProject().getRemotePluginRepositories() : mavenSession.getCurrentProject().getRemoteProjectRepositories(), @@ -479,13 +464,21 @@ private List getIgnoredVersions( Artifact artifact ) @Override public void resolveArtifact( Artifact artifact, boolean usePluginRepositories ) - throws ArtifactResolutionException, ArtifactNotFoundException + throws ArtifactResolutionException { - artifactResolver.resolve( artifact, - usePluginRepositories - ? mavenSession.getCurrentProject().getPluginArtifactRepositories() - : mavenSession.getCurrentProject().getRemoteArtifactRepositories(), - localRepository ); + try + { + aetherRepositorySystem.resolveArtifact( mavenSession.getRepositorySession(), + new ArtifactRequest( toArtifact( artifact ), + usePluginRepositories + ? mavenSession.getCurrentProject().getRemotePluginRepositories() + : mavenSession.getCurrentProject().getRemoteProjectRepositories(), + getClass().getName() ) ); + } + catch ( org.eclipse.aether.resolution.ArtifactResolutionException e ) + { + throw new ArtifactResolutionException( e.getMessage(), artifact ); + } } @Override @@ -882,12 +875,9 @@ public Dependency interpolateVersion( final Dependency dependency, final MavenPr public static class Builder { private RepositorySystem repositorySystem; - private ArtifactResolver artifactResolver; - private ArtifactRepository localRepository; private Collection ignoredVersions; private RuleSet ruleSet; private WagonManager wagonManager; - private Settings settings; private String serverId; private String rulesUri; private Log log; @@ -905,18 +895,6 @@ public Builder withRepositorySystem( RepositorySystem repositorySystem ) return this; } - public Builder withArtifactResolver( ArtifactResolver artifactResolver ) - { - this.artifactResolver = artifactResolver; - return this; - } - - public Builder withLocalRepository( ArtifactRepository localRepository ) - { - this.localRepository = localRepository; - return this; - } - public Builder withIgnoredVersions( Collection ignoredVersions ) { this.ignoredVersions = ignoredVersions; @@ -935,12 +913,6 @@ public Builder withWagonManager( WagonManager wagonManager ) return this; } - public Builder withSettings( Settings settings ) - { - this.settings = settings; - return this; - } - public Builder withServerId( String serverId ) { this.serverId = serverId; @@ -986,7 +958,6 @@ public DefaultVersionsHelper build() throws MojoExecutionException { DefaultVersionsHelper instance = new DefaultVersionsHelper(); instance.repositorySystem = repositorySystem; - instance.artifactResolver = artifactResolver; instance.mavenSession = mavenSession; instance.mojoExecution = mojoExecution; if ( ruleSet != null ) @@ -1002,16 +973,15 @@ public DefaultVersionsHelper build() throws MojoExecutionException instance.ruleSet = isBlank( rulesUri ) ? new RuleSet() : isClasspathUri( rulesUri ) - ? getRulesFromClasspath( rulesUri, log ) - : getRulesViaWagon( rulesUri, log, serverId, serverId, wagonManager, - settings ); + ? getRulesFromClasspath( rulesUri, log ) + : getRulesViaWagon( rulesUri, log, serverId, serverId, wagonManager, + mavenSession.getSettings() ); } if ( ignoredVersions != null && !ignoredVersions.isEmpty() ) { instance.ruleSet = enrichRuleSet( ignoredVersions, instance.ruleSet ); } instance.aetherRepositorySystem = aetherRepositorySystem; - instance.localRepository = localRepository; instance.log = log; return instance; } diff --git a/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java b/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java index 28a11879dd..205fb27a9e 100644 --- a/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java +++ b/versions-common/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java @@ -25,7 +25,6 @@ import java.util.Set; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.model.Dependency; @@ -408,12 +407,11 @@ public VersionPropertiesMapRequest build() * * @param artifact The artifact to resolve. * @param usePluginRepositories whether to resolve from the plugin repositories or the regular repositories. - * @throws ArtifactResolutionException if something goes wrong. - * @throws ArtifactNotFoundException if something goes wrong. + * @throws ArtifactResolutionException if resolution is unsuccessful * @since 1.3 */ void resolveArtifact( Artifact artifact, boolean usePluginRepositories ) - throws ArtifactResolutionException, ArtifactNotFoundException; + throws ArtifactResolutionException; /** * Attempts to interpolate the version from model properties. diff --git a/versions-common/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java b/versions-common/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java index b442516370..a4ece27ace 100644 --- a/versions-common/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java +++ b/versions-common/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java @@ -28,9 +28,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.DefaultArtifactRepository; -import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; -import org.apache.maven.artifact.resolver.DefaultArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecution; @@ -41,7 +38,6 @@ import org.apache.maven.plugin.testing.stubs.DefaultArtifactHandlerStub; import org.apache.maven.project.MavenProject; import org.apache.maven.repository.RepositorySystem; -import org.apache.maven.settings.Settings; import org.codehaus.mojo.versions.model.IgnoreVersion; import org.codehaus.mojo.versions.model.Rule; import org.codehaus.mojo.versions.model.RuleSet; @@ -234,12 +230,8 @@ private DefaultVersionsHelper createHelper( org.eclipse.aether.RepositorySystem .thenReturn( emptyList() ); return new DefaultVersionsHelper.Builder() .withRepositorySystem( lookup( RepositorySystem.class ) ) - .withArtifactResolver( new DefaultArtifactResolver() ) .withAetherRepositorySystem( aetherRepositorySystem ) - .withLocalRepository( new DefaultArtifactRepository( - "", "", new DefaultRepositoryLayout() ) ) .withWagonManager( lookup( WagonManager.class ) ) - .withSettings( new Settings() ) .withServerId( "" ) .withRulesUri( rulesUri ) .withLog( mock( Log.class ) ) diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java index 5bee054503..3bf069a9c6 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java @@ -32,7 +32,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -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; @@ -162,11 +161,9 @@ protected AbstractVersionsDependencyUpdaterMojo( RepositorySystem repositorySyst org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java index 98a6779361..12497c2409 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java @@ -31,7 +31,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.manager.WagonManager; -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; @@ -89,11 +88,9 @@ protected AbstractVersionsDisplayMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } @SuppressWarnings( "unchecked" ) diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java index 45e0b1654f..ab236f9059 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java @@ -27,7 +27,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.sink.Sink; @@ -40,7 +39,6 @@ import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; import org.apache.maven.repository.RepositorySystem; -import org.apache.maven.settings.Settings; import org.codehaus.mojo.versions.api.ArtifactVersions; import org.codehaus.mojo.versions.api.DefaultVersionsHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; @@ -98,12 +96,6 @@ public abstract class AbstractVersionsReport */ private final WagonManager wagonManager; - /** - * @since 1.0-alpha-3 - */ - @Parameter( defaultValue = "${settings}", readonly = true ) - private Settings settings; - /** * settings.xml's server id for the URL. This is used when wagon needs extra authentication information. * @@ -156,8 +148,6 @@ public abstract class AbstractVersionsReport @Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true ) private MojoExecution mojoExecution; - protected ArtifactResolver artifactResolver; - /** *

Allows specifying the {@linkplain RuleSet} object describing rules * on artifact versions to ignore when considering updates.

@@ -196,14 +186,12 @@ public abstract class AbstractVersionsReport protected AbstractVersionsReport( I18N i18n, RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, - ArtifactResolver artifactResolver, WagonManager wagonManager, ReportRendererFactory rendererFactory ) { this.i18n = i18n; this.repositorySystem = repositorySystem; this.aetherRepositorySystem = aetherRepositorySystem; - this.artifactResolver = artifactResolver; this.wagonManager = wagonManager; this.rendererFactory = rendererFactory; } @@ -217,11 +205,8 @@ public VersionsHelper getHelper() { helper = new DefaultVersionsHelper.Builder() .withRepositorySystem( repositorySystem ) - .withArtifactResolver( artifactResolver ) .withAetherRepositorySystem( aetherRepositorySystem ) - .withLocalRepository( localRepository ) .withWagonManager( wagonManager ) - .withSettings( settings ) .withServerId( serverId ) .withRulesUri( rulesUri ) .withRuleSet( ruleSet ) diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java index 4b69512ba5..f878b562d2 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java @@ -33,10 +33,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -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; @@ -49,7 +46,6 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.repository.RepositorySystem; -import org.apache.maven.settings.Settings; import org.codehaus.mojo.versions.api.ArtifactVersions; import org.codehaus.mojo.versions.api.DefaultVersionsHelper; import org.codehaus.mojo.versions.api.PomHelper; @@ -110,35 +106,11 @@ public abstract class AbstractVersionsUpdaterMojo @Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true ) protected List reactorProjects; - /** - * @since 1.0-alpha-3 - */ - @Parameter( defaultValue = "${project.remoteArtifactRepositories}", readonly = true ) - protected List remoteArtifactRepositories; - - /** - * @since 1.0-alpha-3 - */ - @Parameter( defaultValue = "${project.pluginArtifactRepositories}", readonly = true ) - protected List remotePluginRepositories; - - /** - * @since 1.0-alpha-1 - */ - @Parameter( defaultValue = "${localRepository}", readonly = true ) - protected ArtifactRepository localRepository; - /** * The (injected) {@link WagonManager} instance. */ private final WagonManager wagonManager; - /** - * @since 1.0-alpha-3 - */ - @Parameter( defaultValue = "${settings}", readonly = true ) - protected Settings settings; - /** * settings.xml's server id for the URL. This is used when wagon needs extra authentication information. * @@ -189,7 +161,6 @@ public abstract class AbstractVersionsUpdaterMojo @Parameter( defaultValue = "${mojoExecution}", required = true, readonly = true ) private MojoExecution mojoExecution; - protected ArtifactResolver artifactResolver; /** * The format used to record changes. If "none" is specified, no changes are recorded. * @@ -245,14 +216,12 @@ protected AbstractVersionsUpdaterMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { this.repositorySystem = repositorySystem; this.aetherRepositorySystem = aetherRepositorySystem; this.projectBuilder = projectBuilder; this.wagonManager = wagonManager; - this.artifactResolver = artifactResolver; this.changeRecorders = changeRecorders; } @@ -262,11 +231,8 @@ public VersionsHelper getHelper() throws MojoExecutionException { helper = new DefaultVersionsHelper.Builder() .withRepositorySystem( repositorySystem ) - .withArtifactResolver( artifactResolver ) .withAetherRepositorySystem( aetherRepositorySystem ) - .withLocalRepository( localRepository ) .withWagonManager( wagonManager ) - .withSettings( settings ) .withServerId( serverId ) .withRulesUri( rulesUri ) .withRuleSet( ruleSet ) @@ -522,18 +488,13 @@ protected boolean shouldApplyUpdate( Artifact artifact, String currentVersion, A artifact.setVersion( updateVersion.toString() ); try { - artifactResolver.resolveAlways( artifact, remoteArtifactRepositories, localRepository ); + getHelper().resolveArtifact( artifact, false ); } - catch ( ArtifactResolutionException e ) + catch ( ArtifactResolutionException | MojoExecutionException e ) { getLog().warn( "Not updating version: could not resolve " + artifact, e ); return false; } - catch ( ArtifactNotFoundException e ) - { - getLog().warn( "Not updating version: could not find " + artifact, e ); - return false; - } if ( currentVersion.equals( updateVersion.toString() ) ) { diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java index a955c8555b..06ffe7f528 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java @@ -33,7 +33,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -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; @@ -130,12 +129,10 @@ public CompareDependenciesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, MavenProjectBuilder mavenProjectBuilder, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); this.mavenProjectBuilder = mavenProjectBuilder; } @@ -177,7 +174,9 @@ protected void update( ModifiedPomXMLEventReader pom ) try { remoteMavenProject = - mavenProjectBuilder.buildFromRepository( remoteArtifact, remoteArtifactRepositories, localRepository ); + mavenProjectBuilder.buildFromRepository( remoteArtifact, + session.getCurrentProject().getRemoteArtifactRepositories(), + session.getLocalRepository() ); } catch ( ProjectBuildingException e ) { diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java index 5ed1df38b9..dc9bfdbbf6 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java @@ -33,7 +33,6 @@ import java.util.stream.Collectors; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.Dependency; @@ -111,11 +110,10 @@ public class DependencyUpdatesReportMojo extends AbstractVersionsReport changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } private static Set extractPluginDependenciesFromPluginsInPluginManagement( Build build ) diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java index a932c5aa28..0f76921d53 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java @@ -25,7 +25,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -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; @@ -57,11 +56,9 @@ public DisplayParentUpdatesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } @Override diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java index 41840c2785..7818b310a8 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java @@ -174,8 +174,7 @@ public DisplayPluginUpdatesMojo( RepositorySystem repositorySystem, RuntimeInformation runtimeInformation, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); this.lifecycleExecutor = lifecycleExecutor; this.modelInterpolator = modelInterpolator; this.pluginManager = pluginManager; @@ -460,7 +459,8 @@ public void execute() { getHelper().resolveArtifact( probe, true ); MavenProject pluginMavenProject = - projectBuilder.buildFromRepository( probe, remotePluginRepositories, localRepository ); + projectBuilder.buildFromRepository( probe, session.getCurrentProject() + .getRemoteArtifactRepositories(), session.getLocalRepository() ); ArtifactVersion pluginRequires = getPrerequisitesMavenVersion( pluginMavenProject ); if ( artifactVersion == null && compare( specMavenVersion, pluginRequires ) >= 0 ) { @@ -506,7 +506,7 @@ public void execute() minRequires = pluginRequires; } } - catch ( ArtifactResolutionException | ArtifactNotFoundException | ProjectBuildingException e ) + catch ( ArtifactResolutionException | ProjectBuildingException e ) { // ignore bad version } @@ -524,14 +524,15 @@ public void execute() { getHelper().resolveArtifact( probe, true ); MavenProject mavenProject = - projectBuilder.buildFromRepository( probe, remotePluginRepositories, localRepository ); + projectBuilder.buildFromRepository( probe, getProject().getRemoteArtifactRepositories(), + session.getLocalRepository() ); ArtifactVersion requires = getPrerequisitesMavenVersion( mavenProject ); if ( minMavenVersion == null || compare( minMavenVersion, requires ) < 0 ) { minMavenVersion = requires; } } - catch ( ArtifactResolutionException | ArtifactNotFoundException | ProjectBuildingException e ) + catch ( ArtifactResolutionException | ProjectBuildingException e ) { // ignore bad version } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java index 7bf8d69256..d555b87a31 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java @@ -28,7 +28,6 @@ import java.util.TreeSet; import org.apache.maven.artifact.manager.WagonManager; -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.plugin.MojoExecutionException; @@ -145,11 +144,9 @@ public DisplayPropertyUpdatesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } public void execute() diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java index 256c979469..1b7bae0a93 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java @@ -29,7 +29,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Dependency; @@ -41,10 +40,10 @@ 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.recording.ChangeRecord; -import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; +import org.codehaus.mojo.versions.api.recording.ChangeRecord; +import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader; import static java.util.Collections.singletonList; @@ -74,11 +73,9 @@ public ForceReleasesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java index 735c43244e..41c860f034 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java @@ -28,9 +28,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -42,6 +42,7 @@ import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader; +import org.eclipse.aether.resolution.ArtifactRequest; /** * Attempts to resolve unlocked snapshot dependency versions to the locked timestamp versions used in the build. For @@ -71,11 +72,9 @@ public LockSnapshotsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** @@ -200,7 +199,9 @@ private String resolveSnapshotVersion( Artifact artifact ) try { - artifactResolver.resolve( artifact, getProject().getRemoteArtifactRepositories(), localRepository ); + aetherRepositorySystem.resolveArtifact( session.getRepositorySession(), + new ArtifactRequest( RepositoryUtils.toArtifact( artifact ), + getProject().getRemoteProjectRepositories(), getClass().getName() ) ); lockedVersion = artifact.getVersion(); } @@ -226,7 +227,10 @@ private String resolveSnapshotVersion( Dependency dep ) try { Artifact depArtifact = getHelper().createDependencyArtifact( dep ); - artifactResolver.resolve( depArtifact, getProject().getRemoteArtifactRepositories(), localRepository ); + aetherRepositorySystem.resolveArtifact( session.getRepositorySession(), + new ArtifactRequest( RepositoryUtils.toArtifact( depArtifact ), + getProject().getRemoteProjectRepositories(), + getClass().getName() ) ); lockedVersion = depArtifact.getVersion(); } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java index 83bb2ab4b5..f6b768fe69 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java @@ -25,7 +25,6 @@ import java.util.Locale; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -57,11 +56,10 @@ public class ParentUpdatesReportMojo extends AbstractVersionsReport changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java index 4924289303..f8b7785423 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java @@ -42,7 +42,6 @@ import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.plugin.MojoExecutionException; @@ -250,12 +249,10 @@ public SetMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders, Prompter prompter ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); this.prompter = prompter; } @@ -310,7 +307,7 @@ public void execute() throws MojoExecutionException, MojoFailureException getLog().info( "removeSnapshot enabled whilst the version is not a snapshot: nothing to do." ); return; } - if ( settings.isInteractiveMode() ) + if ( session.getSettings().isInteractiveMode() ) { try { @@ -340,7 +337,8 @@ public void execute() throws MojoExecutionException, MojoFailureException try { final MavenProject project = processFromLocalAggregationRoot - ? PomHelper.getLocalRoot( projectBuilder, getProject(), localRepository, null, getLog() ) + ? PomHelper.getLocalRoot( projectBuilder, getProject(), session.getLocalRepository(), + null, getLog() ) : getProject(); getLog().info( "Local aggregation root: " + project.getBasedir() ); diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java index 6abca80b7c..f72ad64f70 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Mojo; @@ -92,14 +91,12 @@ public class SetPropertyMojo @Inject public SetPropertyMojo( RepositorySystem repositorySystem, - org.eclipse.aether.RepositorySystem aetherRepositorySystem, - MavenProjectBuilder projectBuilder, - WagonManager wagonManager, - ArtifactResolver artifactResolver, + org.eclipse.aether.RepositorySystem aetherRepositorySystem, + MavenProjectBuilder projectBuilder, + WagonManager wagonManager, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java index 777ec9287e..2e73f3dfab 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java @@ -9,7 +9,6 @@ import java.util.Map; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Scm; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -71,11 +70,9 @@ public SetScmTagMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java index e3c18336ba..a454db574c 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java @@ -30,7 +30,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -72,11 +71,9 @@ public UnlockSnapshotsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java index 0cd87fa827..254db5431d 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java @@ -30,7 +30,6 @@ import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.plugin.MojoExecutionException; @@ -74,11 +73,9 @@ public UpdateChildModulesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java index 1dac708177..4325f60b09 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java @@ -30,7 +30,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; @@ -143,11 +142,9 @@ public UpdateParentMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java index a5c5d8a094..c04e82d65f 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java @@ -26,7 +26,6 @@ import java.util.Optional; import org.apache.maven.artifact.manager.WagonManager; -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.plugin.MojoExecutionException; @@ -144,11 +143,9 @@ public UpdatePropertiesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java index abef1cf509..21bb0009d4 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java @@ -26,7 +26,6 @@ import java.util.Optional; import org.apache.maven.artifact.manager.WagonManager; -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.plugin.MojoExecutionException; @@ -143,11 +142,9 @@ public UpdatePropertyMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java index c895e14680..2f36f1247f 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java @@ -28,7 +28,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -78,11 +77,9 @@ public UseDepVersionMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } @Override diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java index f0f8d9a2aa..8ee9f69c9f 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java @@ -32,7 +32,6 @@ import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.model.Dependency; @@ -107,11 +106,9 @@ public UseLatestReleasesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java index 96f183b654..92a9be4f9e 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java @@ -30,7 +30,6 @@ import java.util.Optional; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -96,11 +95,9 @@ public UseLatestSnapshotsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java index d7d018d906..6a1601d347 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java @@ -28,7 +28,6 @@ import java.util.Optional; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -39,9 +38,9 @@ import org.apache.maven.repository.RepositorySystem; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.Segment; +import org.codehaus.mojo.versions.api.VersionRetrievalException; import org.codehaus.mojo.versions.api.recording.ChangeRecord; import org.codehaus.mojo.versions.api.recording.ChangeRecorder; -import org.codehaus.mojo.versions.api.VersionRetrievalException; import org.codehaus.mojo.versions.ordering.InvalidSegmentException; import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader; import org.codehaus.mojo.versions.utils.SegmentUtils; @@ -104,11 +103,9 @@ public UseLatestVersionsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } @Override diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojoBase.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojoBase.java index da94696cd4..dc0ec16a8e 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojoBase.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojoBase.java @@ -30,7 +30,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.model.Dependency; @@ -54,11 +53,9 @@ public UseLatestVersionsMojoBase( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java index 64ab6c8b5e..ab700bb25d 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java @@ -28,7 +28,6 @@ import java.util.regex.Pattern; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -36,10 +35,10 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.repository.RepositorySystem; -import org.codehaus.mojo.versions.api.recording.ChangeRecord; -import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; +import org.codehaus.mojo.versions.api.recording.ChangeRecord; +import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader; import static java.util.Collections.singletonList; @@ -70,11 +69,9 @@ public UseNextReleasesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java index ced9081288..bded43e366 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java @@ -29,7 +29,6 @@ import java.util.Optional; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -95,11 +94,9 @@ public UseNextSnapshotsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); // the below is necessary for UseLatestVersionsMojoBase.useLatestVersions to select snapshots allowSnapshots = true; } diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java index 925ca661c6..7694c5a1ad 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -35,10 +34,10 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.repository.RepositorySystem; -import org.codehaus.mojo.versions.api.recording.ChangeRecord; -import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; +import org.codehaus.mojo.versions.api.recording.ChangeRecord; +import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader; import static java.util.Collections.singletonList; @@ -62,11 +61,9 @@ public UseNextVersionsMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java index f583ce2287..c0233e4cff 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; import org.apache.maven.plugin.MojoExecutionException; @@ -61,11 +60,9 @@ public UseReactorMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java index e1a69d156e..6fb108e97f 100644 --- a/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java +++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java @@ -31,7 +31,6 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.model.Dependency; import org.apache.maven.model.DependencyManagement; @@ -88,11 +87,9 @@ public UseReleasesMojo( RepositorySystem repositorySystem, org.eclipse.aether.RepositorySystem aetherRepositorySystem, MavenProjectBuilder projectBuilder, WagonManager wagonManager, - ArtifactResolver artifactResolver, Map changeRecorders ) { - super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, artifactResolver, - changeRecorders ); + super( repositorySystem, aetherRepositorySystem, projectBuilder, wagonManager, changeRecorders ); } /** diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java index 4443242d70..81d7f92e51 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java @@ -69,7 +69,7 @@ private static class TestDependencyUpdatesReportMojo extends DependencyUpdatesRe TestDependencyUpdatesReportMojo() { super( MOCK_I18N, mockRepositorySystem(), mockAetherRepositorySystem(), null, - null, new ReportRendererFactoryImpl( MOCK_I18N ) ); + new ReportRendererFactoryImpl( MOCK_I18N ) ); siteTool = MockUtils.mockSiteTool(); project = new MavenProject(); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java index f399589147..c2b70a3932 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java @@ -31,9 +31,7 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugin.testing.ArtifactStubFactory; import org.apache.maven.plugin.testing.MojoRule; -import org.apache.maven.plugin.testing.stubs.StubArtifactResolver; import org.apache.maven.project.MavenProject; import org.codehaus.mojo.versions.filtering.WildcardMatcher; import org.codehaus.mojo.versions.model.TestIgnoreVersions; @@ -165,7 +163,6 @@ public void testVersionsWithQualifiersNotConsideredAsMinorUpdates() }} ), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), null ) {{ setProject( createProject() ); @@ -212,7 +209,6 @@ public void testAllowMajorUpdatesFalse() }} ), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), null ) {{ setProject( createProject() ); @@ -258,7 +254,6 @@ public void testAllowMinorUpdatesFalse() }} ), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), null ) {{ setProject( createProject() ); @@ -305,7 +300,6 @@ public void testAllowIncrementalUpdatesFalse() }} ), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), null ) {{ setProject( createProject() ); @@ -354,7 +348,6 @@ public void testVersionsWithQualifiersNotConsideredAsIncrementalUpdates() }} ), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), null ) {{ setProject( createProject() ); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java index 0c9d66182c..791ab15895 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ForceReleasesMojoTest.java @@ -7,8 +7,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugin.testing.ArtifactStubFactory; -import org.apache.maven.plugin.testing.stubs.StubArtifactResolver; import org.apache.maven.project.MavenProject; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; @@ -64,10 +62,7 @@ public class ForceReleasesMojoTest extends AbstractMojoTestCase public void setUp() throws IllegalAccessException { changeRecorder = new TestChangeRecorder(); - mojo = new ForceReleasesMojo( mockRepositorySystem(), - mockAetherRepositorySystem(), - null, null, new StubArtifactResolver( new ArtifactStubFactory(), - false, false ), + mojo = new ForceReleasesMojo( mockRepositorySystem(), mockAetherRepositorySystem(), null, null, changeRecorder.asTestMap() ); setVariableValueToObject( mojo, "reactorProjects", emptyList() ); mojo.project = new MavenProject() diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java index 43e8c3046c..449f3d025c 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java @@ -63,7 +63,7 @@ public void testAllowSnapshots() throws IOException, MavenReportException mockAetherRepositorySystem( new HashMap() {{ put( "default-artifact", new String[] {"1.0.0", "1.0.1", "1.1.0", "2.0.0", "2.0.1-SNAPSHOT"} ); - }} ), null, null, new ReportRendererFactoryImpl( MOCK_I18N ) ) + }} ), null, new ReportRendererFactoryImpl( MOCK_I18N ) ) {{ allowSnapshots = true; project = new MavenProject( new Model() diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java index e799b17afd..2342f299bd 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java @@ -70,7 +70,7 @@ private static class TestPluginUpdatesReportMojo extends PluginUpdatesReportMojo TestPluginUpdatesReportMojo() { super( MOCK_I18N, mockRepositorySystem(), mockAetherRepositorySystem(), - null, null, new ReportRendererFactoryImpl( MOCK_I18N ) ); + null, new ReportRendererFactoryImpl( MOCK_I18N ) ); siteTool = MockUtils.mockSiteTool(); project = new MavenProject(); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java index a4a30b8f20..4ebed3b4bf 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java @@ -17,7 +17,7 @@ public class SeparatePatternsForIncludesAnExcludesTest public void setUp() throws Exception { - mojo = new AbstractVersionsDependencyUpdaterMojo( null, null, null, null, null, null ) + mojo = new AbstractVersionsDependencyUpdaterMojo( null, null, null, null, null ) { @Override protected void update( ModifiedPomXMLEventReader pom ) diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java index 3a34edd890..0342773f0e 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java @@ -6,7 +6,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.model.Model; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -48,7 +47,7 @@ public void tearDown() throws IOException @Test public void testGetIncrementedVersion() throws MojoExecutionException { - new SetMojo( null, null, null, null, null, null, null ) + new SetMojo( null, null, null, null, null, null ) { { assertThat( getIncrementedVersion( "1.0.0", null ), is( "1.0.1-SNAPSHOT" ) ); @@ -63,7 +62,7 @@ public void testGetIncrementedVersion() throws MojoExecutionException @Test public void testNextSnapshotIndexLowerBound() { - new SetMojo( null, null, null, null, null, null, null ) + new SetMojo( null, null, null, null, null, null ) { { try @@ -83,7 +82,7 @@ public void testNextSnapshotIndexLowerBound() @Test public void testNextSnapshotIndexUpperBound() { - new SetMojo( null, null, null, null, null, null, null ) + new SetMojo( null, null, null, null, null, null ) { { try @@ -105,7 +104,7 @@ public void testNextSnapshotIndexWithoutNextSnapshot() throws MojoFailureExcepti { try { - new SetMojo( null, null, null, null, null, null, null ) + new SetMojo( null, null, null, null, null, null ) { { project = new MavenProject(); @@ -146,9 +145,7 @@ public void testRemoveSnapshotIdempotency() // no exception should be thrown, the file should stay with version "1.0" SetMojo secondRun = (SetMojo) mojoRule.lookupConfiguredMojo( tempDir.toFile(), "set" ); - MavenExecutionRequest request = - (MavenExecutionRequest) getVariableValueFromObject( secondRun.settings, "request" ); - setVariableValueToObject( request, "interactiveMode", false ); + secondRun.session.getSettings().setInteractiveMode( false ); secondRun.execute(); assertThat( String.join( "", Files.readAllLines( tempDir.resolve( "pom.xml" ) ) ), containsString( "1.0" ) ); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java index 4707286319..b987621633 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java @@ -74,10 +74,9 @@ public static void setUpStatic() public void setUp() throws IllegalAccessException { changeRecorder = new TestChangeRecorder(); - artifactResolver = mock( ArtifactResolver.class ); mojo = new UpdateParentMojo( repositorySystem, aetherRepositorySystem, null, null, - artifactResolver, changeRecorder.asTestMap() ) + changeRecorder.asTestMap() ) {{ setProject( createProject() ); reactorProjects = Collections.emptyList(); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java index 4d69cabbf4..ba3b7b8c7a 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java @@ -25,7 +25,6 @@ import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.MojoRule; -import org.apache.maven.plugin.testing.stubs.StubArtifactRepository; import org.codehaus.mojo.versions.api.recording.ChangeRecorder; import org.codehaus.mojo.versions.utils.TestChangeRecorder; import org.junit.After; @@ -75,7 +74,6 @@ public void tearDown() throws Exception protected T setUpMojo( String goal ) throws Exception { T mojo = (T) mojoRule.lookupConfiguredMojo( pomDir.toFile(), goal ); - setVariableValueToObject( mojo, "localRepository", new StubArtifactRepository( pomDir.toString() ) ); setVariableValueToObject( mojo, "aetherRepositorySystem", aetherRepositorySystem ); setVariableValueToObject( mojo, "generateBackupPoms", false ); setVariableValueToObject( mojo, "changeRecorderFormat", "test" ); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java index f2c7d708e1..4dd3cb1cd8 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java @@ -63,7 +63,6 @@ public void setUp() throws Exception aetherRepositorySystem, null, null, - null, changeRecorder.asTestMap() ) {{ reactorProjects = emptyList(); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java index 4152a9019a..f95c8462f4 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java @@ -76,7 +76,6 @@ public void setUp() throws Exception aetherRepositorySystem, null, null, - null, changeRecorder.asTestMap() ) {{ reactorProjects = emptyList(); diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java index 463a00e395..0827bc1c84 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseReleasesMojoTest.java @@ -7,8 +7,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugin.testing.ArtifactStubFactory; -import org.apache.maven.plugin.testing.stubs.StubArtifactResolver; import org.apache.maven.project.MavenProject; import org.codehaus.mojo.versions.api.PomHelper; import org.codehaus.mojo.versions.api.VersionRetrievalException; @@ -68,7 +66,6 @@ public void setUp() throws IllegalAccessException mockAetherRepositorySystem(), null, null, - new StubArtifactResolver( new ArtifactStubFactory(), false, false ), changeRecorder.asTestMap() ); setVariableValueToObject( mojo, "reactorProjects", emptyList() ); mojo.project = new MavenProject() diff --git a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java index bf980f3786..cc2e09dba6 100644 --- a/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java +++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java @@ -149,8 +149,6 @@ public static MavenSession mockMavenSession() .thenReturn( mock( RepositorySystemSession.class ) ); when( session.getCurrentProject() ).thenReturn( mock( MavenProject.class ) ); when( session.getCurrentProject().getRemotePluginRepositories() ).thenReturn( emptyList() ); - when( session.getCurrentProject().getPluginArtifactRepositories() ).thenReturn( emptyList() ); - when( session.getCurrentProject().getRemoteArtifactRepositories() ).thenReturn( emptyList() ); when( session.getCurrentProject().getRemoteProjectRepositories() ).thenReturn( emptyList() ); return session; }