Skip to content

Commit f784eef

Browse files
cstamasmichael-o
cstamas
authored and
michael-o
committed
[MPIR-399] Upgrade to Maven 3.2.5
* Move to provided scope and Eclipse Aether * Update (related) plugins This closes #33
1 parent 62f490b commit f784eef

File tree

3 files changed

+116
-29
lines changed

3 files changed

+116
-29
lines changed

‎pom.xml‎

Lines changed: 107 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ under the License.
2626
<artifactId>maven-plugins</artifactId>
2727
<groupId>org.apache.maven.plugins</groupId>
2828
<version>34</version>
29-
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
29+
<relativePath/>
3030
</parent>
3131

3232
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -120,11 +120,13 @@ under the License.
120120
<properties>
121121
<doxiaVersion>1.11.1</doxiaVersion>
122122
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
123-
<mavenVersion>3.0</mavenVersion>
123+
<mavenVersion>3.2.5</mavenVersion>
124124
<scmVersion>1.12.2</scmVersion>
125+
<aetherVersion>1.0.0.v20140518</aetherVersion>
125126
<sitePluginVersion>3.11.0</sitePluginVersion>
126127
<surefire.version>2.22.2</surefire.version>
127-
<javaVersion>7</javaVersion>
128+
<javaVersion>8</javaVersion>
129+
<mavenPluginToolsVersion>3.6.4</mavenPluginToolsVersion>
128130
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
129131
<project.build.outputTimestamp>2022-02-21T20:17:22Z</project.build.outputTimestamp>
130132
</properties>
@@ -139,45 +141,50 @@ under the License.
139141
<groupId>org.apache.maven.reporting</groupId>
140142
<artifactId>maven-reporting-impl</artifactId>
141143
<version>3.1.0</version>
144+
<exclusions>
145+
<exclusion>
146+
<groupId>org.apache.maven</groupId>
147+
<artifactId>maven-core</artifactId>
148+
</exclusion>
149+
</exclusions>
142150
</dependency>
143151

144152
<!-- Maven -->
145-
<dependency>
146-
<groupId>org.apache.maven</groupId>
147-
<artifactId>maven-compat</artifactId>
148-
<version>${mavenVersion}</version>
149-
<scope>test</scope>
150-
</dependency>
151-
152153
<dependency>
153154
<groupId>org.apache.maven</groupId>
154155
<artifactId>maven-artifact</artifactId>
155156
<version>${mavenVersion}</version>
157+
<scope>provided</scope>
156158
</dependency>
157159
<dependency>
158160
<groupId>org.apache.maven</groupId>
159161
<artifactId>maven-core</artifactId>
160162
<version>${mavenVersion}</version>
163+
<scope>provided</scope>
161164
</dependency>
162165
<dependency>
163166
<groupId>org.apache.maven</groupId>
164167
<artifactId>maven-model</artifactId>
165168
<version>${mavenVersion}</version>
169+
<scope>provided</scope>
166170
</dependency>
167171
<dependency>
168172
<groupId>org.apache.maven</groupId>
169173
<artifactId>maven-plugin-api</artifactId>
170174
<version>${mavenVersion}</version>
175+
<scope>provided</scope>
171176
</dependency>
172177
<dependency>
173178
<groupId>org.apache.maven</groupId>
174179
<artifactId>maven-repository-metadata</artifactId>
175180
<version>${mavenVersion}</version>
181+
<scope>provided</scope>
176182
</dependency>
177183
<dependency>
178184
<groupId>org.apache.maven</groupId>
179185
<artifactId>maven-settings</artifactId>
180186
<version>${mavenVersion}</version>
187+
<scope>provided</scope>
181188
</dependency>
182189
<dependency>
183190
<groupId>org.apache.maven.shared</groupId>
@@ -187,7 +194,7 @@ under the License.
187194
<dependency>
188195
<groupId>org.apache.maven.shared</groupId>
189196
<artifactId>maven-shared-utils</artifactId>
190-
<version>3.3.3</version>
197+
<version>3.3.4</version>
191198
</dependency>
192199
<dependency>
193200
<groupId>org.apache.maven.shared</groupId>
@@ -198,12 +205,25 @@ under the License.
198205
<groupId>com.google.code.findbugs</groupId>
199206
<artifactId>bcel-findbugs</artifactId>
200207
</exclusion>
208+
<exclusion>
209+
<groupId>org.apache.maven</groupId>
210+
<artifactId>*</artifactId>
211+
</exclusion>
212+
<exclusion>
213+
<groupId>org.codehaus.plexus</groupId>
214+
<artifactId>plexus-container-default</artifactId>
215+
</exclusion>
201216
</exclusions>
202217
</dependency>
203218
<dependency>
204219
<groupId>org.apache.bcel</groupId>
205220
<artifactId>bcel</artifactId>
206-
<version>6.2</version>
221+
<version>6.5.0</version>
222+
</dependency>
223+
<dependency>
224+
<groupId>org.eclipse.aether</groupId>
225+
<artifactId>aether-api</artifactId>
226+
<version>${aetherVersion}</version>
207227
</dependency>
208228

209229
<dependency>
@@ -214,12 +234,18 @@ under the License.
214234
<dependency>
215235
<groupId>org.apache.maven.shared</groupId>
216236
<artifactId>maven-common-artifact-filters</artifactId>
217-
<version>3.1.0</version>
237+
<version>3.2.0</version>
238+
<exclusions>
239+
<exclusion>
240+
<groupId>org.sonatype.sisu</groupId>
241+
<artifactId>sisu-inject-plexus</artifactId>
242+
</exclusion>
243+
</exclusions>
218244
</dependency>
219245
<dependency>
220246
<groupId>org.apache.maven.shared</groupId>
221247
<artifactId>maven-artifact-transfer</artifactId>
222-
<version>0.12.0</version>
248+
<version>0.13.1</version>
223249
</dependency>
224250

225251
<!-- SCM -->
@@ -233,6 +259,12 @@ under the License.
233259
<artifactId>maven-scm-manager-plexus</artifactId>
234260
<version>${scmVersion}</version>
235261
<scope>runtime</scope>
262+
<exclusions>
263+
<exclusion>
264+
<groupId>org.codehaus.plexus</groupId>
265+
<artifactId>plexus-container-default</artifactId>
266+
</exclusion>
267+
</exclusions>
236268
</dependency>
237269
<dependency>
238270
<groupId>org.apache.maven.scm</groupId>
@@ -294,11 +326,23 @@ under the License.
294326
<groupId>org.apache.maven.doxia</groupId>
295327
<artifactId>doxia-sink-api</artifactId>
296328
<version>${doxiaVersion}</version>
329+
<exclusions>
330+
<exclusion>
331+
<groupId>org.codehaus.plexus</groupId>
332+
<artifactId>plexus-container-default</artifactId>
333+
</exclusion>
334+
</exclusions>
297335
</dependency>
298336
<dependency>
299337
<groupId>org.apache.maven.doxia</groupId>
300338
<artifactId>doxia-core</artifactId>
301339
<version>${doxiaVersion}</version>
340+
<exclusions>
341+
<exclusion>
342+
<groupId>org.codehaus.plexus</groupId>
343+
<artifactId>plexus-container-default</artifactId>
344+
</exclusion>
345+
</exclusions>
302346
</dependency>
303347

304348
<!-- Doxia Sitetools -->
@@ -326,6 +370,12 @@ under the License.
326370
<groupId>org.apache.maven.doxia</groupId>
327371
<artifactId>doxia-integration-tools</artifactId>
328372
<version>${doxia-sitetoolsVersion}</version>
373+
<exclusions>
374+
<exclusion>
375+
<groupId>org.codehaus.plexus</groupId>
376+
<artifactId>plexus-container-default</artifactId>
377+
</exclusion>
378+
</exclusions>
329379
</dependency>
330380

331381
<!-- Plexus -->
@@ -343,7 +393,7 @@ under the License.
343393
<dependency>
344394
<groupId>org.codehaus.plexus</groupId>
345395
<artifactId>plexus-utils</artifactId>
346-
<version>3.3.0</version>
396+
<version>3.4.1</version>
347397
</dependency>
348398
<dependency>
349399
<groupId>org.codehaus.plexus</groupId>
@@ -352,6 +402,12 @@ under the License.
352402
</dependency>
353403

354404
<!-- Test -->
405+
<dependency>
406+
<groupId>org.apache.maven</groupId>
407+
<artifactId>maven-compat</artifactId>
408+
<version>${mavenVersion}</version>
409+
<scope>test</scope>
410+
</dependency>
355411
<dependency>
356412
<groupId>org.httpunit</groupId>
357413
<artifactId>httpunit</artifactId>
@@ -361,13 +417,19 @@ under the License.
361417
<dependency>
362418
<groupId>org.apache.maven.plugin-testing</groupId>
363419
<artifactId>maven-plugin-testing-harness</artifactId>
364-
<version>2.1</version>
420+
<version>3.3.0</version>
365421
<scope>test</scope>
422+
<exclusions>
423+
<exclusion>
424+
<groupId>org.codehaus.plexus</groupId>
425+
<artifactId>plexus-container-default</artifactId>
426+
</exclusion>
427+
</exclusions>
366428
</dependency>
367429
<dependency>
368430
<groupId>junit</groupId>
369431
<artifactId>junit</artifactId>
370-
<version>4.13.1</version>
432+
<version>4.13.2</version>
371433
<scope>test</scope>
372434
</dependency>
373435
<dependency>
@@ -383,15 +445,33 @@ under the License.
383445
<scope>test</scope>
384446
</dependency>
385447
<dependency>
386-
<groupId>org.sonatype.aether</groupId>
387-
<artifactId>aether-connector-wagon</artifactId>
388-
<version>1.7</version>
448+
<groupId>org.eclipse.aether</groupId>
449+
<artifactId>aether-impl</artifactId>
450+
<version>${aetherVersion}</version>
451+
<scope>test</scope>
452+
</dependency>
453+
<dependency>
454+
<groupId>org.eclipse.aether</groupId>
455+
<artifactId>aether-connector-basic</artifactId>
456+
<version>${aetherVersion}</version>
457+
<scope>test</scope>
458+
</dependency>
459+
<dependency>
460+
<groupId>org.eclipse.aether</groupId>
461+
<artifactId>aether-transport-wagon</artifactId>
462+
<version>${aetherVersion}</version>
389463
<scope>test</scope>
390464
</dependency>
391465
<dependency>
392466
<groupId>org.apache.maven.wagon</groupId>
393467
<artifactId>wagon-http-lightweight</artifactId>
394-
<version>3.3.4</version>
468+
<version>3.5.1</version>
469+
<scope>test</scope>
470+
</dependency>
471+
<dependency>
472+
<groupId>org.slf4j</groupId>
473+
<artifactId>slf4j-simple</artifactId>
474+
<version>1.7.32</version>
395475
<scope>test</scope>
396476
</dependency>
397477

@@ -404,7 +484,7 @@ under the License.
404484
<dependency>
405485
<groupId>commons-io</groupId>
406486
<artifactId>commons-io</artifactId>
407-
<version>2.6</version>
487+
<version>2.11.0</version>
408488
</dependency>
409489
</dependencies>
410490

@@ -437,6 +517,11 @@ under the License.
437517
<keyalg>RSA</keyalg>
438518
</configuration>
439519
</plugin>
520+
<plugin>
521+
<groupId>org.apache.maven.plugins</groupId>
522+
<artifactId>maven-plugin-plugin</artifactId>
523+
<version>3.6.4</version>
524+
</plugin>
440525
</plugins>
441526
</pluginManagement>
442527
<plugins>

‎src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
import org.apache.maven.report.projectinfo.stubs.DependencyArtifactStubFactory;
3535
import org.codehaus.plexus.i18n.I18N;
3636
import org.codehaus.plexus.util.StringUtils;
37-
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
38-
import org.sonatype.aether.util.DefaultRepositorySystemSession;
37+
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
38+
import org.eclipse.aether.DefaultRepositorySystemSession;
39+
import org.eclipse.aether.repository.LocalRepository;
3940

4041
/**
4142
* Abstract class to test reports generation with <a href="http://www.httpunit.org/">HTTPUnit</a> framework.
@@ -184,7 +185,7 @@ protected AbstractProjectInfoReport createReportMojo( String goal, File pluginXm
184185
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
185186
DefaultRepositorySystemSession repoSession =
186187
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
187-
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( artifactStubFactory.getWorkingDir() ) );
188+
repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( artifactStubFactory.getWorkingDir() ) ) );
188189

189190
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
190191
setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
@@ -200,7 +201,7 @@ protected File generateReport( AbstractProjectInfoReport mojo, File pluginXmlFil
200201
ProjectBuilder builder = lookup( ProjectBuilder.class );
201202

202203
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
203-
buildingRequest.setRepositorySession( null );
204+
buildingRequest.setRepositorySession( lookup( LegacySupport.class ).getRepositorySession() );
204205

205206
assertNotNull( "Local repository", mojo.localRepository );
206207
testMavenProject = builder.build( pluginXmlFile, buildingRequest ).getProject();

‎src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
import org.apache.maven.artifact.DefaultArtifact;
3131
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
3232
import org.apache.maven.artifact.repository.ArtifactRepository;
33-
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
33+
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
34+
import org.apache.maven.artifact.repository.MavenArtifactRepository;
3435
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
3536
import org.apache.maven.artifact.versioning.VersionRange;
3637
import org.apache.maven.model.Build;
@@ -154,8 +155,8 @@ public Set<Artifact> getArtifacts()
154155
@Override
155156
public List<ArtifactRepository> getRemoteArtifactRepositories()
156157
{
157-
ArtifactRepository repository = new DefaultArtifactRepository( "central", "https://repo1.maven.org/maven2",
158-
new DefaultRepositoryLayout() );
158+
ArtifactRepository repository = new MavenArtifactRepository( "central", "https://repo1.maven.org/maven2",
159+
new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy() );
159160

160161
return Collections.singletonList( repository );
161162
}

0 commit comments

Comments
 (0)