maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [maven-site-plugin] branch master updated: [MISTE-804] upgraded Doxia Sitge Renderer to 1.8-SNAPSHOT
Date Wed, 13 Dec 2017 04:48:35 GMT
This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new b14b598  [MISTE-804] upgraded Doxia Sitge Renderer to 1.8-SNAPSHOT
b14b598 is described below

commit b14b598dd9fe6887fca9aeb285284f742a52c761
Author: Hervé Boutemy <hboutemy@apache.org>
AuthorDate: Wed Dec 13 05:48:12 2017 +0100

    [MISTE-804] upgraded Doxia Sitge Renderer to 1.8-SNAPSHOT
---
 pom.xml                                                            | 2 +-
 .../apache/maven/plugins/site/render/ReportDocumentRenderer.java   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8cd5aa5..f7720f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,7 +196,7 @@ under the License.
 
   <properties>
     <doxiaVersion>1.8-SNAPSHOT</doxiaVersion>
-    <doxiaSitetoolsVersion>1.7.5</doxiaSitetoolsVersion>
+    <doxiaSitetoolsVersion>1.8-SNAPSHOT</doxiaSitetoolsVersion>
     <mavenVersion>3.0</mavenVersion>
     <prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
     <wagonVersion>1.0</wagonVersion>
diff --git a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
index e38fe5a..6d8b66f 100644
--- a/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
+++ b/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
@@ -54,6 +54,7 @@ import org.codehaus.plexus.util.WriterFactory;
  * Renders a Maven report in a Doxia site.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @see org.apache.maven.doxia.siterenderer.DoxiaDocumentRenderer
  */
 public class ReportDocumentRenderer
     implements DocumentRenderer
@@ -264,8 +265,8 @@ public class ReportDocumentRenderer
             return;
         }
 
-        // render main sink
-        renderer.generateDocument( writer, mainSink, siteRenderingContext );
+        // render main sink document content
+        renderer.mergeDocumentIntoSite( writer, mainSink, siteRenderingContext );
 
         // render sub-sinks, eventually created by multi-page reports
         String outputName = "";
@@ -288,7 +289,7 @@ public class ReportDocumentRenderer
                 try
                 {
                     out = WriterFactory.newWriter( outputFile, siteRenderingContext.getOutputEncoding()
);
-                    renderer.generateDocument( out, mySink, siteRenderingContext );
+                    renderer.mergeDocumentIntoSite( out, mySink, siteRenderingContext );
                     mySink.close();
                     mySink = null;
                     out.close();

-- 
To stop receiving notification emails like this one, please contact
['"commits@maven.apache.org" <commits@maven.apache.org>'].

Mime
View raw message