Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP2:Update
maven-install-plugin.28016
0002-MINSTALL-171-Update-plugin-requires-Maven-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-MINSTALL-171-Update-plugin-requires-Maven-3.2.5.patch of Package maven-install-plugin.28016
From 9f5b6e0601e1667422717dfe824dbd406bb6ef67 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak <tamas@cservenak.net> Date: Thu, 9 Dec 2021 19:20:36 +0100 Subject: [PATCH 2/4] [MINSTALL-171] Update plugin (requires Maven 3.2.5+) Update plugin source and dependencies: * update Maven requirement to 3.2.5+ * drop org.sonatype resolver, use org.eclipse * set maven bits to provided * drop legacy dependencies, use current ones --- pom.xml | 43 ++++++++++++++++--- .../plugins/install/InstallFileMojoTest.java | 19 ++++---- .../plugins/install/InstallMojoTest.java | 16 ++++--- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 3dc9d05..78cfb73 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,10 @@ </distributionManagement> <properties> - <mavenVersion>3.0</mavenVersion> + <mavenVersion>3.2.5</mavenVersion> + <slf4jVersion>1.7.32</slf4jVersion> + <aetherVersion>1.1.0</aetherVersion> + <surefire.version>2.22.2</surefire.version> <javaVersion>7</javaVersion> </properties> @@ -72,13 +75,21 @@ <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-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-core</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-artifact-transfer</artifactId> @@ -95,13 +106,13 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13.2</version> <scope>test</scope> </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! --> @@ -119,13 +130,31 @@ <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> </dependencies> @@ -149,7 +178,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>3.0.1</version> + <version>3.2.2</version> <configuration> <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> <cloneClean>true</cloneClean> 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 f0360c9..bf040b1 100644 --- a/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java @@ -26,15 +26,14 @@ import org.apache.maven.execution.MavenSession; 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.apache.maven.shared.utils.io.IOUtil; -import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager; -import org.sonatype.aether.util.ChecksumUtils; -import org.sonatype.aether.util.DefaultRepositorySystemSession; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.NoLocalRepositoryManagerException; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -282,12 +281,16 @@ public class InstallFileMojoTest { return parameter.replace( '.', '/' ); } - - private MavenSession createMavenSession() + + private MavenSession createMavenSession() throws NoLocalRepositoryManagerException { MavenSession session = mock( MavenSession.class ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); - repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) ); + repositorySession.setLocalRepositoryManager( + new EnhancedLocalRepositoryManagerFactory().newInstance( + repositorySession, 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 63ac6fa..ed73d2c 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.MavenProject; 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.DefaultRepositorySystemSession; +import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.NoLocalRepositoryManagerException; /** * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a> @@ -85,7 +87,7 @@ public class InstallMojoTest MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); updateMavenProject( project ); - + setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); setVariableValueToObject( mojo, "session", createMavenSession() ); @@ -343,11 +345,15 @@ public class InstallMojoTest return parameter.replace( '.', '/' ); } - private MavenSession createMavenSession() + private MavenSession createMavenSession() throws NoLocalRepositoryManagerException { MavenSession session = mock( MavenSession.class ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); - repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) ); + repositorySession.setLocalRepositoryManager( + new EnhancedLocalRepositoryManagerFactory().newInstance( + repositorySession, new LocalRepository( LOCAL_REPO ) + ) + ); ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest(); buildingRequest.setRepositorySession( repositorySession ); when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); -- 2.36.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
