This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch cli-properties in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit 9f0dc40e74cb14ed12c55689033d72758c5fefac Author: Hervé Boutemy <[email protected]> AuthorDate: Wed Jul 8 04:08:21 2026 +0200 use new API incting CLI properties benefit from Doxia Sitetools upgrade in #1269 that includes https://github.com/apache/maven-doxia-sitetools/issues/629 --- .../site/descriptor/AbstractSiteDescriptorMojo.java | 15 ++++++++++++++- .../plugins/site/render/AbstractSiteRenderingMojo.java | 7 ------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java index 4f84a7d6..395ccd14 100644 --- a/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/descriptor/AbstractSiteDescriptorMojo.java @@ -26,6 +26,7 @@ import org.apache.maven.doxia.site.SiteModel; import org.apache.maven.doxia.site.inheritance.SiteModelInheritanceAssembler; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.doxia.tools.SiteToolException; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.site.AbstractSiteMojo; @@ -49,6 +50,12 @@ public abstract class AbstractSiteDescriptorMojo extends AbstractSiteMojo { @Parameter(defaultValue = "${repositorySystemSession}", required = true, readonly = true) protected RepositorySystemSession repoSession; + /** + * The current Maven session. + */ + @Parameter(defaultValue = "${session}", readonly = true) + protected MavenSession mavenSession; + /** * Remote project repositories used for the project. * @@ -93,7 +100,13 @@ public abstract class AbstractSiteDescriptorMojo extends AbstractSiteMojo { SiteModel siteModel; try { siteModel = siteTool.getSiteModel( - siteDirectory, locale, project, reactorProjects, repoSession, remoteProjectRepositories); + siteDirectory, + locale, + mavenSession.getRequest(), + project, + reactorProjects, + repoSession, + remoteProjectRepositories); } catch (SiteToolException e) { throw new MojoExecutionException("Failed to obtain site model", e); } diff --git a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java index a06c26ec..316d8c7c 100644 --- a/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java +++ b/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java @@ -45,7 +45,6 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.SiteRenderingContext.SiteDirectory; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.doxia.tools.SiteToolException; -import org.apache.maven.execution.MavenSession; import org.apache.maven.model.ReportPlugin; import org.apache.maven.model.Reporting; import org.apache.maven.plugin.MojoExecution; @@ -114,12 +113,6 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo @Parameter protected File[] alternativeSiteSourceDirectories; - /** - * The current Maven session. - */ - @Parameter(defaultValue = "${session}", readonly = true, required = true) - protected MavenSession mavenSession; - /** * The mojo execution */
