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/02/24 16:05:14 UTC

[maven-reporting-impl] branch mvn4 updated: Switch a few core plugins to the new api

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-reporting-impl.git


The following commit(s) were added to refs/heads/mvn4 by this push:
     new b9de2b4  Switch a few core plugins to the new api
b9de2b4 is described below

commit b9de2b45c18c730a4c48bb144c9404917c270911
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Feb 24 17:00:58 2022 +0100

    Switch a few core plugins to the new api
---
 pom.xml                                                           | 2 +-
 src/main/java/org/apache/maven/reporting/AbstractMavenReport.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6aabb07..6fb04cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
   <properties>
     <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
     <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
-    <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+    <doxiaSitetoolsVersion>2.0.0-M3-SNAPSHOT</doxiaSitetoolsVersion>
     <javaVersion>8</javaVersion>
     <project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
   </properties>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 016b455..8eb7c4f 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -132,7 +132,7 @@ public abstract class AbstractMavenReport
         siteContext.setLocale( locale );
         siteContext.setTemplateProperties( getTemplateProperties() );
 
-        RenderingContext context = new RenderingContext( outputDirectory, filename );
+        RenderingContext context = new RenderingContext( outputDirectory, filename, null );
 
         SiteRendererSink sink = new SiteRendererSink( context );
 
@@ -149,7 +149,7 @@ public abstract class AbstractMavenReport
                     new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ),
                                             getOutputEncoding() ) )
                 {
-                    getSiteRenderer().generateDocument( writer, sink, siteContext );
+                    getSiteRenderer().mergeDocumentIntoSite( writer, sink, siteContext );
                 }
             }
         }