You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2021/10/07 08:44:39 UTC
[maven-deploy-plugin] 01/01: Deploy At End feature (no extension)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch deploy-at-end
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit 4eab93f94027f0fae82a9e703f0e7f9c5d0c31d5
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Oct 7 10:42:06 2021 +0200
Deploy At End feature (no extension)
This PR makes deployAtEnd work as expected even
if maven-deploy-plugin is not used as extension.
How it works: it uses mojo Context to store "markers" (and params):
* presence of marker means project was "processed"
* value of marker tells what should be done (true = deploy, false = skipped)
* if needed, other params are stored as well
UTs adjusted to provide plugin context (was null before).
---
pom.xml | 76 ++++++++++-----
.../apache/maven/plugins/deploy/DeployMojo.java | 105 ++++++++++++++++-----
.../maven/plugins/deploy/DeployFileMojoTest.java | 17 ++--
.../maven/plugins/deploy/DeployMojoTest.java | 35 ++++---
.../org/apache/maven/plugins/deploy/Utils.java | 2 +-
5 files changed, 166 insertions(+), 69 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c590c6..fcba2f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,10 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>3.2.5</mavenVersion>
+ <slf4jVersion>1.7.32</slf4jVersion>
+ <aetherVersion>1.1.0</aetherVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
</properties>
@@ -73,35 +75,34 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
+ <artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
+
+ <!-- This is here to override 3.0 coming with maven-artifact-transfer -->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>0.13.1</version>
</dependency>
- <!-- Upgrade of transitive dependency. -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
- </dependency>
-
+
<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
@@ -111,12 +112,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.2.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency> <!-- used by maven-plugin-testing-harness, don't give it compile scope! -->
@@ -134,28 +135,52 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
- <version>1.7</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.5</version>
+ <version>${slf4jVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.5</version>
+ <version>${slf4jVersion}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-basic</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-file</artifactId>
+ <version>${aetherVersion}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<contributors>
@@ -188,6 +213,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
+ <version>3.2.2</version>
<configuration>
<debug>true</debug>
<showErrors>true</showErrors>
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
index ae26134..ef5372a 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -19,10 +19,8 @@ package org.apache.maven.plugins.deploy;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -30,6 +28,7 @@ import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -51,27 +50,31 @@ import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
public class DeployMojo
extends AbstractDeployMojo
{
- private static final Pattern ALT_LEGACY_REPO_SYNTAX_PATTERN = Pattern.compile( "(.+?)::(.+?)::(.+)" );
+ private static final String DEPLOY_PROCESSED_MARKER =
+ DeployMojo.class.getName() + ".processed";
- private static final Pattern ALT_REPO_SYNTAX_PATTERN = Pattern.compile( "(.+?)::(.+)" );
+ private static final String DEPLOY_ALT_RELEASE_DEPLOYMENT_REPOSITORY =
+ DeployMojo.class.getName() + ".altReleaseDeploymentRepository";
- /**
- * When building with multiple threads, reaching the last project doesn't have to mean that all projects are ready
- * to be deployed
- */
- private static final AtomicInteger READYPROJECTSCOUNTER = new AtomicInteger();
+ private static final String DEPLOY_ALT_SNAPSHOT_DEPLOYMENT_REPOSITORY =
+ DeployMojo.class.getName() + ".altSnapshotDeploymentRepository";
- private static final List<ProjectDeployerRequest> DEPLOYREQUESTS =
- Collections.synchronizedList( new ArrayList<ProjectDeployerRequest>() );
+ private static final String DEPLOY_ALT_DEPLOYMENT_REPOSITORY =
+ DeployMojo.class.getName() + ".altDeploymentRepository";
+
+ private static final Pattern ALT_LEGACY_REPO_SYNTAX_PATTERN = Pattern.compile( "(.+?)::(.+?)::(.+)" );
+
+ private static final Pattern ALT_REPO_SYNTAX_PATTERN = Pattern.compile( "(.+?)::(.+)" );
- /**
- */
@Parameter( defaultValue = "${project}", readonly = true, required = true )
private MavenProject project;
@Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true )
private List<MavenProject> reactorProjects;
+ @Parameter( defaultValue = "${plugin}", required = true, readonly = true )
+ private PluginDescriptor pluginDescriptor;
+
/**
* Whether every project should be deployed during its own deploy-phase or at the end of the multimodule build. If
* set to {@code true} and the build fails, none of the reactor projects is deployed.
@@ -146,12 +149,14 @@ public class DeployMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ final String projectKey = project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion();
boolean addedDeployRequest = false;
if ( Boolean.parseBoolean( skip )
|| ( "releases".equals( skip ) && !ArtifactUtils.isSnapshot( project.getVersion() ) )
|| ( "snapshots".equals( skip ) && ArtifactUtils.isSnapshot( project.getVersion() ) )
)
{
+ getPluginContext().put( DEPLOY_PROCESSED_MARKER, Boolean.FALSE );
getLog().info( "Skipping artifact deployment" );
}
else
@@ -177,29 +182,81 @@ public class DeployMojo
}
else
{
- DEPLOYREQUESTS.add( pdr );
+ if ( altReleaseDeploymentRepository != null )
+ {
+ getPluginContext().put(
+ DEPLOY_ALT_RELEASE_DEPLOYMENT_REPOSITORY,
+ altReleaseDeploymentRepository
+ );
+ }
+ if ( altSnapshotDeploymentRepository != null )
+ {
+ getPluginContext().put(
+ DEPLOY_ALT_SNAPSHOT_DEPLOYMENT_REPOSITORY,
+ altSnapshotDeploymentRepository
+ );
+ }
+ if ( altDeploymentRepository != null )
+ {
+ getPluginContext().put(
+ DEPLOY_ALT_DEPLOYMENT_REPOSITORY,
+ altDeploymentRepository
+ );
+ }
+ getPluginContext().put( DEPLOY_PROCESSED_MARKER, Boolean.TRUE );
addedDeployRequest = true;
}
}
- boolean projectsReady = READYPROJECTSCOUNTER.incrementAndGet() == reactorProjects.size();
- if ( projectsReady )
+ if ( allProjectsMarked() )
{
- synchronized ( DEPLOYREQUESTS )
+ for ( MavenProject reactorProject : reactorProjects )
{
- while ( !DEPLOYREQUESTS.isEmpty() )
+ Map<String, Object> pluginContext = getSession().getPluginContext( pluginDescriptor, reactorProject );
+ Boolean install = (Boolean) pluginContext.get( DEPLOY_PROCESSED_MARKER );
+ if ( !install )
{
- ArtifactRepository repo = getDeploymentRepository( DEPLOYREQUESTS.get( 0 ) );
-
- deployProject( getSession().getProjectBuildingRequest(), DEPLOYREQUESTS.remove( 0 ), repo );
+ getLog().info( "Project " + projectKey + " skipped install" );
+ }
+ else
+ {
+ String altReleaseDeploymentRepository =
+ (String) pluginContext.get( DEPLOY_ALT_RELEASE_DEPLOYMENT_REPOSITORY );
+ String altSnapshotDeploymentRepository =
+ (String) pluginContext.get( DEPLOY_ALT_SNAPSHOT_DEPLOYMENT_REPOSITORY );
+ String altDeploymentRepository =
+ (String) pluginContext.get( DEPLOY_ALT_DEPLOYMENT_REPOSITORY );
+
+ ProjectDeployerRequest pdr = new ProjectDeployerRequest()
+ .setProject( reactorProject )
+ .setRetryFailedDeploymentCount( getRetryFailedDeploymentCount() )
+ .setAltReleaseDeploymentRepository( altReleaseDeploymentRepository )
+ .setAltSnapshotDeploymentRepository( altSnapshotDeploymentRepository )
+ .setAltDeploymentRepository( altDeploymentRepository );
+
+ ArtifactRepository repo = getDeploymentRepository( pdr );
+
+ deployProject( getSession().getProjectBuildingRequest(), pdr, repo );
}
}
}
else if ( addedDeployRequest )
{
- getLog().info( "Deploying " + project.getGroupId() + ":" + project.getArtifactId() + ":"
- + project.getVersion() + " at end" );
+ getLog().info( "Deploying " + projectKey + " at end" );
+ }
+ }
+
+ private boolean allProjectsMarked()
+ {
+ for ( MavenProject reactorProject : reactorProjects )
+ {
+ Map<String, Object> pluginContext = getSession().getPluginContext( pluginDescriptor, reactorProject );
+ if ( !pluginContext.containsKey( DEPLOY_PROCESSED_MARKER ) )
+ {
+ return false;
+ }
}
+ return true;
}
private void deployProject( ProjectBuildingRequest pbr, ProjectDeployerRequest pir, ArtifactRepository repo )
diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
index 6c7064b..b07b550 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/DeployFileMojoTest.java
@@ -30,11 +30,12 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -92,8 +93,8 @@ public class DeployFileMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
String groupId = (String) getVariableValueFromObject( mojo, "groupId" );
@@ -193,8 +194,8 @@ public class DeployFileMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
String classifier = ( String ) getVariableValueFromObject( mojo, "classifier" );
@@ -241,8 +242,8 @@ public class DeployFileMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
String groupId = (String) getVariableValueFromObject( mojo, "groupId" );
diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
index 63fe2de..e032bd7 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.deploy;
* under the License.
*/
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -28,11 +29,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugins.deploy.stubs.ArtifactDeployerStub;
@@ -40,14 +43,15 @@ import org.apache.maven.plugins.deploy.stubs.ArtifactRepositoryStub;
import org.apache.maven.plugins.deploy.stubs.DeployArtifactStub;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
import org.codehaus.plexus.util.FileUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.junit.Ignore;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -77,7 +81,11 @@ public class DeployMojoTest
throws Exception
{
super.setUp();
-
+
+ MockitoAnnotations.initMocks( this );
+ when( session.getPluginContext( any(PluginDescriptor.class ), any( MavenProject.class ) ) )
+ .thenReturn( new ConcurrentHashMap<>( ));
+
remoteRepo = new File( REMOTE_REPO );
remoteRepo.mkdirs();
@@ -132,8 +140,8 @@ public class DeployMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
File file = new File( getBasedir(),
@@ -143,7 +151,8 @@ public class DeployMojoTest
assertTrue( file.exists() );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
-
+
+ setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() );
setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
artifact = ( DeployArtifactStub ) project.getArtifact();
@@ -250,7 +259,9 @@ public class DeployMojoTest
assertTrue( file.exists() );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
-
+
+ setVariableValueToObject( mojo, "session", session );
+ setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() );
setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
artifact = (DeployArtifactStub) project.getArtifact();
@@ -303,8 +314,8 @@ public class DeployMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
File pomFile = new File( getBasedir(),
@@ -315,6 +326,7 @@ public class DeployMojoTest
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
+ setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() );
setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
artifact = (DeployArtifactStub) project.getArtifact();
@@ -380,6 +392,7 @@ public class DeployMojoTest
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
+ setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() );
setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
artifact = (DeployArtifactStub) project.getArtifact();
@@ -415,8 +428,8 @@ public class DeployMojoTest
ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO )) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
diff --git a/src/test/java/org/apache/maven/plugins/deploy/Utils.java b/src/test/java/org/apache/maven/plugins/deploy/Utils.java
index 4df7442..f4acbc9 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/Utils.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/Utils.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.plugin.MojoExecutionException;
-import org.sonatype.aether.util.ChecksumUtils;
+import org.eclipse.aether.util.ChecksumUtils;
/**
* A utility class to assist testing.