diff --git a/pom.xml b/pom.xml index fdacfb60c..8ba334dca 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 41 + 42 @@ -111,11 +111,11 @@ under the License. 8 - 3.2.5 + 3.6.3 1.11.1 1.11.1 - 2.4 - 1.0.0.v20140518 + 3.5.3 + 1.4.1 1.2.0 9.4.53.v20231009 @@ -135,29 +135,29 @@ under the License. - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} - org.eclipse.aether - aether-transport-wagon - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-wagon + ${resolverVersion} - org.eclipse.aether - aether-impl - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-impl + ${resolverVersion} - org.eclipse.aether - aether-util - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-util + ${resolverVersion} @@ -386,13 +386,13 @@ under the License. test - org.eclipse.aether - aether-connector-basic + org.apache.maven.resolver + maven-resolver-connector-basic test - org.eclipse.aether - aether-transport-wagon + org.apache.maven.resolver + maven-resolver-transport-wagon test diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java index 74bb96b1f..381291d76 100644 --- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java +++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java @@ -45,6 +45,7 @@ import org.apache.maven.plugins.javadoc.ProxyServer.AuthAsyncProxyServlet; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; +import org.apache.maven.project.ProjectBuildingRequest.RepositoryMerging; import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Settings; import org.apache.maven.shared.utils.io.FileUtils; @@ -905,6 +906,7 @@ public void testProxy() throws Exception { MavenSession session = spy(newMavenSession(mojo.project)); ProjectBuildingRequest buildingRequest = mock(ProjectBuildingRequest.class); when(buildingRequest.getRemoteRepositories()).thenReturn(mojo.project.getRemoteArtifactRepositories()); + when(buildingRequest.getRepositoryMerging()).thenReturn(RepositoryMerging.POM_DOMINANT); when(session.getProjectBuildingRequest()).thenReturn(buildingRequest); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); repositorySession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()