You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:04 UTC
[maven-javadoc-plugin] branch mvn4 created (now 9fdf711)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git.
at 9fdf711 mvn4 aggregator
This branch includes the following new commits:
new 9fdf711 mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-javadoc-plugin] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 9fdf7117ba9d924162fec7ed8b2aef75186f19be
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:00 2022 +0100
mvn4 aggregator
---
pom.xml | 35 ++++++++++++---------
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 4 +--
.../maven/plugins/javadoc/JavadocReport.java | 2 +-
.../javadoc/AggregatorJavadocReportTest.java | 8 +++--
.../maven/plugins/javadoc/JavadocReportTest.java | 36 +++++++++++++---------
5 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index c99c94a..04fb3ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath />
</parent>
@@ -67,10 +67,11 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.0</mavenVersion>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
- <wagonVersion>2.4</wagonVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
+ <resolverVersion>1.8.0-SNAPSHOT</resolverVersion>
<sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
<plexus-java.version>1.1.0</plexus-java.version>
<jetty.version>9.4.43.v20210629</jetty.version>
@@ -193,6 +194,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-resolver-provider</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
@@ -207,27 +213,27 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.5.1</version>
+ <version>3.5.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.1</version>
+ <version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- Doxia -->
@@ -241,7 +247,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
+ <version>${doxiaSitetoolsVersion}</version>
</dependency>
<!-- wagon -->
@@ -331,7 +337,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -365,8 +371,9 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-wagon</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 6fde43e..e7e94b3 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -7125,8 +7125,8 @@ public abstract class AbstractJavadocMojo
Map<Path, MavenProject> reactorProjectsMap = new HashMap<>();
for ( MavenProject reactorProject : this.reactorProjects )
{
- if ( !isSkippedJavadoc( reactorProject ) && //
- !isSkippedModule( reactorProject ) )
+ if ( !isSkippedJavadoc( reactorProject )
+ && !isSkippedModule( reactorProject ) )
{
reactorProjectsMap.put( reactorProject.getBasedir().toPath(), reactorProject );
}
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
index 545e2ff..7be5029 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocReport.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.ResourceBundle;
import java.util.stream.Collectors;
+import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.siterenderer.RenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.MojoExecutionException;
@@ -38,7 +39,6 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
import org.codehaus.plexus.util.StringUtils;
/**
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..fb93eba 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.SimpleLocalRepositoryManagerFactory;
+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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repoSysSession, 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 3dc5ffd..09bf580 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -54,17 +54,19 @@ 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.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
import org.hamcrest.MatcherAssert;
import org.junit.AssumptionViolatedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
/**
* Test {@link org.apache.maven.plugins.javadoc.JavadocReport} class.
@@ -505,8 +507,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -687,8 +690,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -982,8 +986,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1194,8 +1199,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1248,8 +1254,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );
@@ -1370,8 +1377,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 SimpleLocalRepositoryManagerFactory()
+ .newInstance( repositorySession, new LocalRepository( localRepo ) ) );
when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
when( session.getRepositorySession() ).thenReturn( repositorySession );
LegacySupport legacySupport = lookup( LegacySupport.class );