Skip to content

Commit 4e72048

Browse files
michael-omichael-o
committed
[MJAVADOC-795] Upgrade to Parent 42 and Maven 3.6.3
This closes #281
1 parent b55dd96 commit 4e72048

File tree

4 files changed

+32
-83
lines changed

4 files changed

+32
-83
lines changed

‎pom.xml‎

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven.plugins</groupId>
2525
<artifactId>maven-plugins</artifactId>
26-
<version>41</version>
26+
<version>42</version>
2727
<relativePath />
2828
</parent>
2929

@@ -111,11 +111,11 @@ under the License.
111111

112112
<properties>
113113
<javaVersion>8</javaVersion>
114-
<mavenVersion>3.2.5</mavenVersion>
114+
<mavenVersion>3.6.3</mavenVersion>
115115
<doxiaVersion>1.11.1</doxiaVersion>
116116
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
117-
<wagonVersion>2.4</wagonVersion>
118-
<aetherVersion>1.0.0.v20140518</aetherVersion>
117+
<wagonVersion>3.5.3</wagonVersion>
118+
<resolverVersion>1.4.1</resolverVersion>
119119
<!-- https://cwiki.apache.org/confluence/x/VIHOCg#MavenEcosystemCleanup-ResolverandMaven -->
120120
<plexus-java.version>1.2.0</plexus-java.version>
121121
<jetty.version>9.4.53.v20231009</jetty.version>
@@ -132,36 +132,6 @@ under the License.
132132
<slf4jVersion>1.7.36</slf4jVersion>
133133
</properties>
134134

135-
<dependencyManagement>
136-
<dependencies>
137-
<dependency>
138-
<groupId>org.eclipse.aether</groupId>
139-
<artifactId>aether-api</artifactId>
140-
<version>${aetherVersion}</version>
141-
</dependency>
142-
<dependency>
143-
<groupId>org.eclipse.aether</groupId>
144-
<artifactId>aether-connector-basic</artifactId>
145-
<version>${aetherVersion}</version>
146-
</dependency>
147-
<dependency>
148-
<groupId>org.eclipse.aether</groupId>
149-
<artifactId>aether-transport-wagon</artifactId>
150-
<version>${aetherVersion}</version>
151-
</dependency>
152-
<dependency>
153-
<groupId>org.eclipse.aether</groupId>
154-
<artifactId>aether-impl</artifactId>
155-
<version>${aetherVersion}</version>
156-
</dependency>
157-
<dependency>
158-
<groupId>org.eclipse.aether</groupId>
159-
<artifactId>aether-util</artifactId>
160-
<version>${aetherVersion}</version>
161-
</dependency>
162-
</dependencies>
163-
</dependencyManagement>
164-
165135
<dependencies>
166136
<dependency>
167137
<!-- @TODO remove!! -->
@@ -206,6 +176,23 @@ under the License.
206176
<artifactId>maven-plugin-annotations</artifactId>
207177
<scope>provided</scope>
208178
</dependency>
179+
<dependency>
180+
<groupId>org.apache.maven.resolver</groupId>
181+
<artifactId>maven-resolver-api</artifactId>
182+
<version>${resolverVersion}</version>
183+
<scope>provided</scope>
184+
</dependency>
185+
<dependency>
186+
<groupId>org.apache.maven.resolver</groupId>
187+
<artifactId>maven-resolver-impl</artifactId>
188+
<version>${resolverVersion}</version>
189+
<scope>provided</scope>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.apache.maven.resolver</groupId>
193+
<artifactId>maven-resolver-util</artifactId>
194+
<version>${resolverVersion}</version>
195+
</dependency>
209196
<dependency>
210197
<groupId>javax.inject</groupId>
211198
<artifactId>javax.inject</artifactId>
@@ -386,13 +373,15 @@ under the License.
386373
<scope>test</scope>
387374
</dependency>
388375
<dependency>
389-
<groupId>org.eclipse.aether</groupId>
390-
<artifactId>aether-connector-basic</artifactId>
376+
<groupId>org.apache.maven.resolver</groupId>
377+
<artifactId>maven-resolver-connector-basic</artifactId>
378+
<version>${resolverVersion}</version>
391379
<scope>test</scope>
392380
</dependency>
393381
<dependency>
394-
<groupId>org.eclipse.aether</groupId>
395-
<artifactId>aether-transport-wagon</artifactId>
382+
<groupId>org.apache.maven.resolver</groupId>
383+
<artifactId>maven-resolver-transport-wagon</artifactId>
384+
<version>${resolverVersion}</version>
396385
<scope>test</scope>
397386
</dependency>
398387
<dependency>
@@ -486,7 +475,6 @@ under the License.
486475
<configuration>
487476
<systemPropertyVariables>
488477
<maven.home>${maven.home}</maven.home>
489-
<https.protocols>${https.protocols}</https.protocols>
490478
</systemPropertyVariables>
491479
<environmentVariables>
492480
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>

‎src/test/java/org/apache/maven/plugins/javadoc/FixJavadocMojoTest.java‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -503,13 +503,10 @@ private void executeMojoAndTest(File testPomBasedir, String[] clazzToCompare) th
503503
.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
504504
.newInstance(
505505
session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
506-
// Ensure remote repo connection uses SSL
507-
File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml");
508-
session.getRequest().setGlobalSettingsFile(globalSettingsFile);
509506
setVariableValueToObject(mojo, "session", session);
510507

511508
// compile the test project
512-
invokeCompileGoal(testPom, globalSettingsFile, mojo.getLog());
509+
invokeCompileGoal(testPom, mojo.getLog());
513510
assertTrue(new File(testPomBasedir, "target/classes").exists());
514511

515512
mojo.execute();
@@ -532,7 +529,7 @@ private void executeMojoAndTest(File testPomBasedir, String[] clazzToCompare) th
532529
* @param log not null
533530
* @throws MavenInvocationException if any
534531
*/
535-
private void invokeCompileGoal(File testPom, File globalSettingsFile, Log log) throws Exception {
532+
private void invokeCompileGoal(File testPom, Log log) throws Exception {
536533
List<String> goals = new ArrayList<>();
537534
goals.add("clean");
538535
goals.add("compile");
@@ -543,13 +540,7 @@ private void invokeCompileGoal(File testPom, File globalSettingsFile, Log log) t
543540
Properties properties = new Properties();
544541

545542
JavadocUtil.invokeMaven(
546-
log,
547-
new File(getBasedir(), "target/local-repo"),
548-
testPom,
549-
goals,
550-
properties,
551-
invokerLogFile,
552-
globalSettingsFile);
543+
log, new File(getBasedir(), "target/local-repo"), testPom, goals, properties, invokerLogFile, null);
553544
}
554545

555546
// ----------------------------------------------------------------------

‎src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.apache.maven.plugins.javadoc.ProxyServer.AuthAsyncProxyServlet;
4646
import org.apache.maven.project.MavenProject;
4747
import org.apache.maven.project.ProjectBuildingRequest;
48+
import org.apache.maven.project.ProjectBuildingRequest.RepositoryMerging;
4849
import org.apache.maven.settings.Proxy;
4950
import org.apache.maven.settings.Settings;
5051
import org.apache.maven.shared.utils.io.FileUtils;
@@ -905,6 +906,7 @@ public void testProxy() throws Exception {
905906
MavenSession session = spy(newMavenSession(mojo.project));
906907
ProjectBuildingRequest buildingRequest = mock(ProjectBuildingRequest.class);
907908
when(buildingRequest.getRemoteRepositories()).thenReturn(mojo.project.getRemoteArtifactRepositories());
909+
when(buildingRequest.getRepositoryMerging()).thenReturn(RepositoryMerging.POM_DOMINANT);
908910
when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
909911
DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
910912
repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
@@ -1097,8 +1099,6 @@ public void testTagletArtifacts() throws Exception {
10971099
repoSysSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
10981100
.newInstance(session.getRepositorySession(), new LocalRepository(new File("target/local-repo"))));
10991101
// Ensure remote repo connection uses SSL
1100-
File globalSettingsFile = new File(getBasedir(), "target/test-classes/unit/settings.xml");
1101-
session.getRequest().setGlobalSettingsFile(globalSettingsFile);
11021102
LegacySupport legacySupport = lookup(LegacySupport.class);
11031103
legacySupport.setSession(session);
11041104
setVariableValueToObject(mojo, "session", session);

‎src/test/resources/unit/settings.xml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)