Skip to content

Commit 50568fc

Browse files
elharoelharo
authored
[MDEP-717] Upgrade to 3.1.1 (#78)
* use Maven 3.1.1
1 parent 9b51b5c commit 50568fc

File tree

13 files changed

+133
-137
lines changed

13 files changed

+133
-137
lines changed

‎pom.xml

+27-21
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ under the License.
8989
</contributors>
9090

9191
<properties>
92-
<mavenVersion>3.0</mavenVersion>
92+
<mavenVersion>3.1.1</mavenVersion>
9393
<doxiaVersion>1.9.1</doxiaVersion>
9494
<doxiaSiteVersion>1.9.2</doxiaSiteVersion>
9595
<jettyVersion>9.2.28.v20190418</jettyVersion>
96-
<pluginTestingVersion>2.1</pluginTestingVersion>
96+
<pluginTestingVersion>3.1.0</pluginTestingVersion>
9797
<javaVersion>7</javaVersion>
9898
<project.build.outputTimestamp>2020-03-07T11:40:47Z</project.build.outputTimestamp>
9999
</properties>
@@ -111,12 +111,6 @@ under the License.
111111
<dependencies>
112112
<!-- maven -->
113113
<!-- Remove once deprecated code has been replaced/removed -->
114-
<dependency>
115-
<groupId>org.apache.maven</groupId>
116-
<artifactId>maven-compat</artifactId>
117-
<version>${mavenVersion}</version>
118-
<scope>test</scope>
119-
</dependency>
120114
<dependency>
121115
<groupId>org.apache.maven</groupId>
122116
<artifactId>maven-artifact</artifactId>
@@ -268,6 +262,19 @@ under the License.
268262
<groupId>org.apache.maven.plugin-tools</groupId>
269263
<artifactId>maven-plugin-annotations</artifactId>
270264
</dependency>
265+
266+
<dependency>
267+
<groupId>org.eclipse.aether</groupId>
268+
<artifactId>aether-connector-wagon</artifactId>
269+
<version>0.9.0.M2</version>
270+
<scope>provided</scope>
271+
</dependency>
272+
<dependency>
273+
<groupId>org.apache.maven.wagon</groupId>
274+
<artifactId>wagon-http-lightweight</artifactId>
275+
<version>3.4.0</version>
276+
<scope>provided</scope>
277+
</dependency>
271278

272279
<!-- test -->
273280
<dependency>
@@ -295,24 +302,23 @@ under the License.
295302
<scope>test</scope>
296303
</dependency>
297304

298-
<dependency>
305+
<dependency>
299306
<groupId>org.codehaus.plexus</groupId>
300307
<artifactId>plexus-interpolation</artifactId>
301308
<version>1.26</version>
302309
<scope>test</scope>
303310
</dependency>
304-
305-
<dependency>
306-
<groupId>org.sonatype.aether</groupId>
307-
<artifactId>aether-connector-wagon</artifactId>
308-
<version>1.7</version>
309-
<scope>provided</scope>
310-
</dependency>
311311
<dependency>
312-
<groupId>org.apache.maven.wagon</groupId>
313-
<artifactId>wagon-http-lightweight</artifactId>
314-
<version>3.4.0</version>
315-
<scope>provided</scope>
312+
<groupId>org.apache.maven</groupId>
313+
<artifactId>maven-compat</artifactId>
314+
<version>${mavenVersion}</version>
315+
<scope>test</scope>
316+
<exclusions>
317+
<exclusion>
318+
<groupId>asm</groupId>
319+
<artifactId>asm</artifactId>
320+
</exclusion>
321+
</exclusions>
316322
</dependency>
317323

318324
<dependency>
@@ -391,7 +397,7 @@ under the License.
391397
<groupId>org.apache.maven.plugins</groupId>
392398
<artifactId>maven-surefire-plugin</artifactId>
393399
<configuration>
394-
<!-- Need of more heap space in order to run the unit tests !-->
400+
<!-- Need more heap space in order to run the unit tests !-->
395401
<argLine>-Xmx384m</argLine>
396402
<systemPropertyVariables>
397403
<maven.home>${maven.home}</maven.home>

‎src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.apache.maven.plugins.annotations.ResolutionScope;
4444
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
4545
import org.apache.maven.project.MavenProjectHelper;
46+
import org.apache.maven.project.ProjectBuildingRequest;
4647
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
4748
import org.apache.maven.shared.transfer.repository.RepositoryManager;
4849
import org.codehaus.plexus.util.StringUtils;
@@ -280,7 +281,8 @@ protected void appendArtifactPath( Artifact art, StringBuilder sb )
280281
// substitute the property for the local repo path to make the classpath file portable.
281282
if ( StringUtils.isNotEmpty( localRepoProperty ) )
282283
{
283-
File localBasedir = repositoryManager.getLocalRepositoryBasedir( session.getProjectBuildingRequest() );
284+
ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
285+
File localBasedir = repositoryManager.getLocalRepositoryBasedir( projectBuildingRequest );
284286

285287
file = StringUtils.replace( file, localBasedir.getAbsolutePath(), localRepoProperty );
286288
}

‎src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java

+19
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@
2323
import java.io.IOException;
2424

2525
import org.apache.commons.io.FileUtils;
26+
import org.apache.maven.plugin.LegacySupport;
2627
import org.apache.maven.plugin.MojoExecutionException;
2728
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
29+
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
30+
import org.eclipse.aether.DefaultRepositorySystemSession;
31+
import org.eclipse.aether.RepositorySystem;
32+
import org.eclipse.aether.repository.LocalRepository;
33+
import org.eclipse.aether.repository.LocalRepositoryManager;
2834
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
2935

3036
public abstract class AbstractDependencyMojoTestCase
@@ -76,4 +82,17 @@ protected void copyFile( AbstractDependencyMojo mojo, File artifact, File destFi
7682
{
7783
mojo.copyFile( artifact, destFile );
7884
}
85+
86+
87+
protected void installLocalRepository( LegacySupport legacySupport )
88+
throws ComponentLookupException
89+
{
90+
DefaultRepositorySystemSession repoSession =
91+
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
92+
RepositorySystem system = lookup( RepositorySystem.class );
93+
String directory = stubFactory.getWorkingDir().toString();
94+
LocalRepository localRepository = new LocalRepository( directory );
95+
LocalRepositoryManager manager = system.newLocalRepositoryManager( repoSession, localRepository );
96+
repoSession.setLocalRepositoryManager( manager );
97+
}
7998
}

‎src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java

+8-13
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@
4141
import org.eclipse.jetty.server.handler.ContextHandler;
4242
import org.eclipse.jetty.server.handler.ResourceHandler;
4343
import org.eclipse.jetty.util.security.Constraint;
44-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
45-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
4644

4745
public class TestGetMojo
4846
extends AbstractDependencyMojoTestCase
4947
{
50-
GetMojo mojo;
48+
private GetMojo mojo;
5149

5250
protected void setUp()
5351
throws Exception
@@ -56,24 +54,22 @@ protected void setUp()
5654
super.setUp( "markers", false );
5755

5856
File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
59-
assert testPom.exists();
6057
mojo = (GetMojo) lookupMojo( "get", testPom );
6158

6259
assertNotNull( mojo );
6360

6461
LegacySupport legacySupport = lookup( LegacySupport.class );
65-
MavenSession session = newMavenSession( new MavenProjectStub() );
66-
Settings settings = session.getSettings();
62+
MavenSession mavenSession = newMavenSession( new MavenProjectStub() );
63+
Settings settings = mavenSession.getSettings();
6764
Server server = new Server();
6865
server.setId( "myserver" );
6966
server.setUsername( "foo" );
7067
server.setPassword( "bar" );
7168
settings.addServer( server );
72-
legacySupport.setSession( session );
73-
DefaultRepositorySystemSession repoSession =
74-
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
75-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
76-
69+
legacySupport.setSession( mavenSession );
70+
71+
installLocalRepository( legacySupport );
72+
7773
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
7874
}
7975

@@ -150,9 +146,8 @@ public void testRemoteRepositoriesAuthentication()
150146
public void testParseRepository()
151147
throws Exception
152148
{
153-
ArtifactRepository repo;
154149
ArtifactRepositoryPolicy policy = null;
155-
repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
150+
ArtifactRepository repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
156151
assertEquals( "central", repo.getId() );
157152
assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
158153
assertEquals( "https://repo.maven.apache.org/maven2", repo.getUrl() );

‎src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
2525
import org.apache.maven.settings.Server;
2626
import org.apache.maven.settings.Settings;
27-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
28-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
2927

3028
import java.io.File;
3129

@@ -37,10 +35,10 @@ public class TestListClassesMojo
3735
protected void setUp()
3836
throws Exception
3937
{
40-
// required for mojo lookups to work
4138
super.setUp( "markers", false );
42-
4339
File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
40+
41+
assertTrue( testPom.exists() );
4442
mojo = (ListClassesMojo) lookupMojo( "list-classes", testPom );
4543

4644
assertNotNull( mojo );
@@ -54,9 +52,8 @@ protected void setUp()
5452
server.setPassword( "bar" );
5553
settings.addServer( server );
5654
legacySupport.setSession( session );
57-
DefaultRepositorySystemSession repoSession =
58-
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
59-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
55+
56+
installLocalRepository( legacySupport );
6057

6158
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
6259
}

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java

+6-14
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,16 @@
2929
import org.apache.maven.artifact.versioning.VersionRange;
3030
import org.apache.maven.execution.MavenSession;
3131
import org.apache.maven.model.Dependency;
32+
import org.apache.maven.plugin.LegacySupport;
3233
import org.apache.maven.plugin.MojoExecutionException;
3334
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
3435
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
3536
import org.apache.maven.project.MavenProject;
36-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
37-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
3837

3938
public class TestCopyMojo
4039
extends AbstractDependencyMojoTestCase
4140
{
42-
CopyMojo mojo;
43-
44-
public TestCopyMojo()
45-
{
46-
super();
47-
}
41+
private CopyMojo mojo;
4842

4943
protected void setUp()
5044
throws Exception
@@ -58,18 +52,16 @@ protected void setUp()
5852

5953
assertNotNull( mojo );
6054
assertNotNull( mojo.getProject() );
61-
// MavenProject project = mojo.getProject();
62-
// init classifier things
6355

6456
MavenSession session = newMavenSession( mojo.getProject() );
6557
setVariableValueToObject( mojo, "session", session );
6658

67-
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
68-
69-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
59+
LegacySupport legacySupport = lookup( LegacySupport.class );
60+
legacySupport.setSession( session );
61+
installLocalRepository( legacySupport );
7062
}
7163

72-
public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
64+
private ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
7365
throws MojoExecutionException
7466
{
7567
List<ArtifactItem> list =

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626

2727
import org.apache.maven.artifact.Artifact;
2828
import org.apache.maven.execution.MavenSession;
29+
import org.apache.maven.plugin.LegacySupport;
2930
import org.apache.maven.plugin.MojoExecutionException;
3031
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
3132
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
3233
import org.codehaus.plexus.archiver.manager.ArchiverManager;
33-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
34-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
3534

3635
public class TestIncludeExcludeUnpackMojo
3736
extends AbstractDependencyMojoTestCase
@@ -44,7 +43,7 @@ public class TestIncludeExcludeUnpackMojo
4443

4544
private final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
4645

47-
UnpackMojo mojo;
46+
private UnpackMojo mojo;
4847

4948
protected void setUp()
5049
throws Exception
@@ -77,9 +76,9 @@ protected void setUp()
7776
MavenSession session = newMavenSession( mojo.getProject() );
7877
setVariableValueToObject( mojo, "session", session );
7978

80-
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
81-
82-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
79+
LegacySupport legacySupport = lookup( LegacySupport.class );
80+
legacySupport.setSession( session );
81+
installLocalRepository( legacySupport );
8382
}
8483

8584
protected void tearDown()

‎src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
import org.apache.maven.artifact.versioning.VersionRange;
2424
import org.apache.maven.execution.MavenSession;
2525
import org.apache.maven.model.Dependency;
26+
import org.apache.maven.plugin.LegacySupport;
2627
import org.apache.maven.plugin.MojoExecutionException;
2728
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
2829
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
2930
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
3031
import org.apache.maven.project.MavenProject;
31-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
32-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
3332

3433
import java.io.File;
3534
import java.io.IOException;
@@ -45,11 +44,6 @@ public class TestUnpackMojo
4544

4645
UnpackMojo mojo;
4746

48-
public TestUnpackMojo()
49-
{
50-
super();
51-
}
52-
5347
protected void setUp()
5448
throws Exception
5549
{
@@ -77,9 +71,10 @@ protected void setUp()
7771
MavenSession session = newMavenSession( mojo.getProject() );
7872
setVariableValueToObject( mojo, "session", session );
7973

80-
DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
74+
LegacySupport legacySupport = lookup( LegacySupport.class );
8175

82-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
76+
legacySupport.setSession( session );
77+
installLocalRepository( legacySupport );
8378
}
8479

8580
public ArtifactItem getSingleArtifactItem( boolean removeVersion )

0 commit comments

Comments
 (0)