Skip to content

Commit 2c63998

Browse files
cstamascstamas
authored
Merge pull request #17 from apache/MINSTALL-171-update-plugin
[MINSTALL-171] Update plugin (requires Maven 3.2.5+)
2 parents 2f3cf08 + e8ba1da commit 2c63998

File tree

3 files changed

+58
-17
lines changed

3 files changed

+58
-17
lines changed

‎pom.xml

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@
6363
</distributionManagement>
6464

6565
<properties>
66-
<mavenVersion>3.0</mavenVersion>
66+
<mavenVersion>3.2.5</mavenVersion>
67+
<slf4jVersion>1.7.32</slf4jVersion>
68+
<aetherVersion>1.1.0</aetherVersion>
69+
<surefire.version>2.22.2</surefire.version>
6770
<javaVersion>7</javaVersion>
6871
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
6972
</properties>
@@ -73,13 +76,21 @@
7376
<groupId>org.apache.maven</groupId>
7477
<artifactId>maven-plugin-api</artifactId>
7578
<version>${mavenVersion}</version>
79+
<scope>provided</scope>
7680
</dependency>
7781
<dependency>
7882
<groupId>org.apache.maven</groupId>
7983
<artifactId>maven-artifact</artifactId>
8084
<version>${mavenVersion}</version>
85+
<scope>provided</scope>
86+
</dependency>
87+
<!-- This is here to override 3.0 coming with maven-artifact-transfer -->
88+
<dependency>
89+
<groupId>org.apache.maven</groupId>
90+
<artifactId>maven-core</artifactId>
91+
<version>${mavenVersion}</version>
92+
<scope>provided</scope>
8193
</dependency>
82-
8394
<dependency>
8495
<groupId>org.apache.maven.shared</groupId>
8596
<artifactId>maven-artifact-transfer</artifactId>
@@ -96,13 +107,13 @@
96107
<dependency>
97108
<groupId>junit</groupId>
98109
<artifactId>junit</artifactId>
99-
<version>4.13.1</version>
110+
<version>4.13.2</version>
100111
<scope>test</scope>
101112
</dependency>
102113
<dependency>
103114
<groupId>org.apache.maven.plugin-testing</groupId>
104115
<artifactId>maven-plugin-testing-harness</artifactId>
105-
<version>2.1</version>
116+
<version>3.3.0</version>
106117
<scope>test</scope>
107118
</dependency>
108119
<dependency> <!-- used by maven-plugin-testing-harness, don't give it compile scope! -->
@@ -120,13 +131,31 @@
120131
<dependency>
121132
<groupId>org.slf4j</groupId>
122133
<artifactId>slf4j-api</artifactId>
123-
<version>1.7.30</version>
134+
<version>${slf4jVersion}</version>
124135
<scope>provided</scope>
125136
</dependency>
126137
<dependency>
127138
<groupId>org.slf4j</groupId>
128139
<artifactId>slf4j-nop</artifactId>
129-
<version>1.7.30</version>
140+
<version>${slf4jVersion}</version>
141+
<scope>test</scope>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.eclipse.aether</groupId>
145+
<artifactId>aether-api</artifactId>
146+
<version>${aetherVersion}</version>
147+
<scope>test</scope>
148+
</dependency>
149+
<dependency>
150+
<groupId>org.eclipse.aether</groupId>
151+
<artifactId>aether-util</artifactId>
152+
<version>${aetherVersion}</version>
153+
<scope>test</scope>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.eclipse.aether</groupId>
157+
<artifactId>aether-impl</artifactId>
158+
<version>${aetherVersion}</version>
130159
<scope>test</scope>
131160
</dependency>
132161
</dependencies>
@@ -150,6 +179,7 @@
150179
<plugin>
151180
<groupId>org.apache.maven.plugins</groupId>
152181
<artifactId>maven-invoker-plugin</artifactId>
182+
<version>3.2.2</version>
153183
<configuration>
154184
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
155185
<cloneClean>true</cloneClean>

‎src/test/java/org/apache/maven/plugins/install/InstallFileMojoTest.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
import org.apache.maven.model.Model;
2727
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
2828
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
29-
import org.apache.maven.plugins.install.InstallFileMojo;
3029
import org.apache.maven.project.DefaultProjectBuildingRequest;
3130
import org.apache.maven.project.ProjectBuildingRequest;
3231
import org.apache.maven.shared.utils.ReaderFactory;
3332
import org.apache.maven.shared.utils.io.FileUtils;
34-
import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager;
35-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
33+
import org.eclipse.aether.DefaultRepositorySystemSession;
34+
import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
35+
import org.eclipse.aether.repository.LocalRepository;
36+
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
3637

3738
import static org.mockito.Mockito.mock;
3839
import static org.mockito.Mockito.when;
@@ -280,12 +281,16 @@ private String dotToSlashReplacer( String parameter )
280281
{
281282
return parameter.replace( '.', '/' );
282283
}
283-
284-
private MavenSession createMavenSession()
284+
285+
private MavenSession createMavenSession() throws NoLocalRepositoryManagerException
285286
{
286287
MavenSession session = mock( MavenSession.class );
287288
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
288-
repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) );
289+
repositorySession.setLocalRepositoryManager(
290+
new EnhancedLocalRepositoryManagerFactory().newInstance(
291+
repositorySession, new LocalRepository( LOCAL_REPO )
292+
)
293+
);
289294
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
290295
buildingRequest.setRepositorySession( repositorySession );
291296
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );

‎src/test/java/org/apache/maven/plugins/install/InstallMojoTest.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838
import org.apache.maven.project.ProjectBuildingRequest;
3939
import org.apache.maven.shared.transfer.repository.RepositoryManager;
4040
import org.apache.maven.shared.utils.io.FileUtils;
41-
import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager;
42-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
41+
import org.eclipse.aether.DefaultRepositorySystemSession;
42+
import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
43+
import org.eclipse.aether.repository.LocalRepository;
44+
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
4345

4446
/**
4547
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -85,7 +87,7 @@ public void testBasicInstall()
8587

8688
MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
8789
updateMavenProject( project );
88-
90+
8991
setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
9092
setVariableValueToObject( mojo, "session", createMavenSession() );
9193

@@ -343,11 +345,15 @@ private String dotToSlashReplacer( String parameter )
343345
return parameter.replace( '.', '/' );
344346
}
345347

346-
private MavenSession createMavenSession()
348+
private MavenSession createMavenSession() throws NoLocalRepositoryManagerException
347349
{
348350
MavenSession session = mock( MavenSession.class );
349351
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
350-
repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( new File( LOCAL_REPO ) ) );
352+
repositorySession.setLocalRepositoryManager(
353+
new EnhancedLocalRepositoryManagerFactory().newInstance(
354+
repositorySession, new LocalRepository( LOCAL_REPO )
355+
)
356+
);
351357
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
352358
buildingRequest.setRepositorySession( repositorySession );
353359
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );

0 commit comments

Comments
 (0)