From aaf68df4fc3f9f7733a6953bf259aa08049653a1 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 14 Sep 2021 09:08:59 +0200 Subject: [PATCH 1/2] Update plugin to forget org.sonatype stuff (that was still used in UT!) in version 3.0.0-M1!!! Also, bump m-a-t to 2.0.0-SNAP to run ITs. m-a-t 2.0.0-SNAP w/ m-install-p passes OK --- pom.xml | 30 +++++++++++++++---- .../plugins/install/InstallFileMojoTest.java | 11 +++---- .../plugins/install/InstallMojoTest.java | 10 ++++--- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index ca7b8764..fb349a38 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ - 3.0 + 3.1.1 7 2020-04-07T21:04:00Z @@ -83,7 +83,7 @@ org.apache.maven.shared maven-artifact-transfer - 0.13.1 + 2.0.0-SNAPSHOT @@ -96,13 +96,13 @@ junit junit - 4.13.1 + 4.13.2 test org.apache.maven.plugin-testing maven-plugin-testing-harness - 2.1 + 3.1.0 test @@ -120,13 +120,31 @@ org.slf4j slf4j-api - 1.7.30 + 1.7.32 provided org.slf4j slf4j-nop - 1.7.30 + 1.7.32 + test + + + org.eclipse.aether + aether-api + 1.1.0 + test + + + org.eclipse.aether + aether-util + 1.1.0 + test + + + org.eclipse.aether + aether-impl + 1.1.0 test diff --git a/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java b/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java index 8b3b070b..d50178e7 100644 --- a/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java @@ -26,13 +26,14 @@ import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.plugin.testing.AbstractMojoTestCase; -import org.apache.maven.plugins.install.InstallFileMojo; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.utils.ReaderFactory; import org.apache.maven.shared.utils.io.FileUtils; -import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager; -import org.sonatype.aether.util.DefaultRepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.repository.LocalRepository; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -281,11 +282,11 @@ private String dotToSlashReplacer( String parameter ) return parameter.replace( '.', '/' ); } - private MavenSession createMavenSession() + private MavenSession createMavenSession() throws Exception { MavenSession session = mock( MavenSession.class ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); - repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) ); + repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( mock( RepositorySystemSession.class ), new LocalRepository(LOCAL_REPO) ) ); ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(); buildingRequest.setRepositorySession( repositorySession ); when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); diff --git a/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java b/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java index 63ac6fa9..e34305ab 100644 --- a/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java @@ -38,8 +38,10 @@ import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.transfer.repository.RepositoryManager; import org.apache.maven.shared.utils.io.FileUtils; -import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager; -import org.sonatype.aether.util.DefaultRepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.repository.LocalRepository; /** * @author Allan Ramirez @@ -343,11 +345,11 @@ private String dotToSlashReplacer( String parameter ) return parameter.replace( '.', '/' ); } - private MavenSession createMavenSession() + private MavenSession createMavenSession() throws Exception { MavenSession session = mock( MavenSession.class ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); - repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) ); + repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance( mock( RepositorySystemSession.class ), new LocalRepository(LOCAL_REPO) ) ); ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(); buildingRequest.setRepositorySession( repositorySession ); when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); From 7436b88baac0d146874d53a8a9dfac8d07d65e32 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Tue, 28 Sep 2021 08:44:41 +0200 Subject: [PATCH 2/2] Import proper core and set them provided The UTs need core, but m-a-t imports ancient 3.0 of core. Plugin with these change will now work with m-a-t as well. --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb349a38..c4550204 100644 --- a/pom.xml +++ b/pom.xml @@ -73,17 +73,25 @@ org.apache.maven maven-plugin-api ${mavenVersion} + provided org.apache.maven maven-artifact ${mavenVersion} + provided + + + org.apache.maven + maven-core + ${mavenVersion} + provided org.apache.maven.shared maven-artifact-transfer - 2.0.0-SNAPSHOT + 0.13.1