You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/05/24 18:39:56 UTC
[maven-javadoc-plugin] 01/03: Reqire Maven 3.1.1
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 22785f1052e20be09fd49a7a297b7947c101126e
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue May 18 00:20:38 2021 +0200
Reqire Maven 3.1.1
---
pom.xml | 32 +++++++++----------
.../javadoc/AggregatorJavadocReportTest.java | 8 +++--
.../maven/plugins/javadoc/JavadocReportTest.java | 36 +++++++++++++---------
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index 14eacd7..2e0a1fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,15 +67,15 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<doxia-sitetoolsVersion>1.9.2</doxia-sitetoolsVersion>
<wagonVersion>2.4</wagonVersion>
- <sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
+ <eclipseAetherVersion>0.9.0.M2</eclipseAetherVersion>
<plexus-java.version>1.0.7</plexus-java.version>
<!-- for ITs -->
- <sitePluginVersion>3.3</sitePluginVersion>
- <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
+ <sitePluginVersion>3.9.1</sitePluginVersion>
+ <projectInfoReportsPluginVersion>3.1.1</projectInfoReportsPluginVersion>
<project.build.outputTimestamp>2021-05-18T17:44:35Z</project.build.outputTimestamp>
</properties>
@@ -130,29 +130,29 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
- <version>${sonatypeAetherVersion}</version>
+ <version>${eclipseAetherVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -329,7 +329,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -351,7 +351,7 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index 7f58c9d..84aa08e 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -34,8 +34,9 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.languages.java.version.JavaVersion;
import org.codehaus.plexus.util.FileUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
public class AggregatorJavadocReportTest
extends AbstractMojoTestCase
@@ -77,7 +78,8 @@ public class AggregatorJavadocReportTest
MavenSession session = newMavenSession( currentProject );
DefaultRepositorySystemSession repoSysSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSysSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ repoSysSession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
setVariableValueToObject( mojo, "session", session );
return mojo;
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 a7f00eb..ec9b724 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -54,16 +54,18 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugins.javadoc.ProxyServer.AuthAsyncProxyServlet;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.languages.java.version.JavaVersion;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.hamcrest.MatcherAssert;
import org.junit.AssumptionViolatedException;
import org.junit.Ignore;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
/**
* Test {@link org.apache.maven.plugins.javadoc.JavadocReport} class.
@@ -487,8 +489,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -669,8 +672,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -970,8 +974,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1175,8 +1180,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1229,8 +1235,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1351,8 +1358,9 @@ public class JavadocReportTest
ProjectBuildingRequest buildingRequest = mock( ProjectBuildingRequest.class );
when( buildingRequest.getRemoteRepositories() ).thenReturn( mojo.project.getRemoteArtifactRepositories() );
when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ DefaultRepositorySystemSession repositorySession = MavenRepositorySystemUtils.newSession();
+ repositorySession.setLocalRepositoryManager( new EnhancedLocalRepositoryManagerFactory().newInstance(
+ session.getRepositorySession(), new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );