This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch open-issues in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git
commit bdd7c13a82c657c0d2d9a96e29f8845e110ae816 Author: Michael Osipov <[email protected]> AuthorDate: Sat Apr 15 19:33:35 2023 +0200 [MSITE-950] Upgrade to Doxia Sitetools to 2.0.0-M8, Maven Reporting API 4.0.0-M6, Maven Reporting Impl/Exec 4.0.0-M7 --- pom.xml | 6 +++--- .../maven/plugins/site/render/AbstractSiteRenderingMojo.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 60401bdb..6ab2ff94 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ under the License. <!-- for dependencies --> <jettyVersion>9.4.50.v20221201</jettyVersion> <doxiaVersion>2.0.0-M6</doxiaVersion> - <doxiaSitetoolsVersion>2.0.0-M7</doxiaSitetoolsVersion> + <doxiaSitetoolsVersion>2.0.0-M8</doxiaSitetoolsVersion> <wagonVersion>3.5.3</wagonVersion> <slf4jVersion>1.7.36</slf4jVersion> <!-- for ITs --> @@ -209,7 +209,7 @@ under the License. <projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion> <surefirePluginVersion>3.0.0</surefirePluginVersion> <mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion> - <mavenReportingImplVersion>4.0.0-M6</mavenReportingImplVersion> + <mavenReportingImplVersion>4.0.0-M7</mavenReportingImplVersion> <fluidoSkinVersion>2.0.0-M3</fluidoSkinVersion> <surefire.version>3.0.0</surefire.version> <project.build.outputTimestamp>2023-04-08T16:17:12Z</project.build.outputTimestamp> @@ -225,7 +225,7 @@ under the License. <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-exec</artifactId> - <version>2.0.0-M6</version> + <version>2.0.0-M7</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> 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 36940a07..82a4eed3 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 @@ -46,6 +46,7 @@ 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; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.descriptor.PluginDescriptor; @@ -119,6 +120,12 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo @Parameter(defaultValue = "${session}", readonly = true, required = true) protected MavenSession mavenSession; + /** + * The mojo execution + */ + @Parameter(defaultValue = "${mojoExecution}", readonly = true, required = true) + protected MojoExecution mojoExecution; + /** * replaces previous reportPlugins parameter, that was injected by Maven core from * reporting section: but this new configuration format has been abandoned. @@ -192,6 +199,7 @@ public abstract class AbstractSiteRenderingMojo extends AbstractSiteDescriptorMo protected List<MavenReportExecution> getReports() throws MojoExecutionException { MavenReportExecutorRequest mavenReportExecutorRequest = new MavenReportExecutorRequest(); mavenReportExecutorRequest.setMavenSession(mavenSession); + mavenReportExecutorRequest.setExecutionId(mojoExecution.getExecutionId()); mavenReportExecutorRequest.setProject(project); mavenReportExecutorRequest.setReportPlugins(getReportingPlugins());
