This is an automated email from the ASF dual-hosted git repository.
michaelo 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 0e9a300c [MSITE-962] Upgrade to Doxia Sitetools to 2.0.0-M10, Maven
Reporting Impl/Exec 4.0.0-M8, Maven Fluido Skin 2.0.0-M6
0e9a300c is described below
commit 0e9a300c8a538b78f79161eab06c2d6a2d57f298
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Wed Apr 26 16:52:59 2023 +0200
[MSITE-962] Upgrade to Doxia Sitetools to 2.0.0-M10, Maven Reporting
Impl/Exec 4.0.0-M8, Maven Fluido Skin 2.0.0-M6
---
pom.xml | 8 ++---
.../render/CategorySummaryDocumentRenderer.java | 4 +--
.../site/render/ReportDocumentRenderer.java | 39 ++++++++++------------
.../site/render/SitemapDocumentRenderer.java | 4 +--
4 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e93673c..2adcd668 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-M8</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>2.0.0-M10</doxiaSitetoolsVersion>
<wagonVersion>3.5.3</wagonVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<!-- for ITs -->
@@ -209,8 +209,8 @@ under the License.
<projectInfoReportsPluginVersion>3.4.2</projectInfoReportsPluginVersion>
<surefirePluginVersion>3.0.0</surefirePluginVersion>
<mavenPluginPluginVersion>3.8.1</mavenPluginPluginVersion>
- <mavenReportingImplVersion>4.0.0-M7</mavenReportingImplVersion>
- <testingFluidoSkinVersion>2.0.0-M3</testingFluidoSkinVersion>
+ <mavenReportingImplVersion>4.0.0-M8</mavenReportingImplVersion>
+ <testingFluidoSkinVersion>2.0.0-M6</testingFluidoSkinVersion>
<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-M7</version>
+ <version>2.0.0-M8</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git
a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
index 1f8bba4d..2eca2b75 100644
---
a/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
+++
b/src/main/java/org/apache/maven/plugins/site/render/CategorySummaryDocumentRenderer.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.plugins.site.render;
-import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
import java.util.List;
@@ -83,7 +83,7 @@ public class CategorySummaryDocumentRenderer implements
SitePluginReportDocument
}
public void renderDocument(Writer writer, SiteRenderer siteRenderer,
SiteRenderingContext siteRenderingContext)
- throws RendererException, FileNotFoundException {
+ throws RendererException, IOException {
String msg = "Generating \"" + buffer().strong(title) + "\" report";
// CHECKSTYLE_OFF: MagicNumber
log.info((StringUtils.rightPad(msg, 40) + buffer().strong(" ---
").mojo(reportMojoInfo)));
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 ef8d7cb3..6a70d506 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
@@ -19,7 +19,6 @@
package org.apache.maven.plugins.site.render;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
@@ -170,7 +169,7 @@ public class ReportDocumentRenderer implements
DocumentRenderer {
@Override
public void renderDocument(Writer writer, SiteRenderer siteRenderer,
SiteRenderingContext siteRenderingContext)
- throws RendererException, FileNotFoundException {
+ throws RendererException, IOException {
Locale locale = siteRenderingContext.getLocale();
String localReportName = report.getName(locale);
@@ -231,34 +230,30 @@ public class ReportDocumentRenderer implements
DocumentRenderer {
// render sub-sinks, eventually created by multi-page reports
String outputName = "";
- try {
- List<MultiPageSubSink> sinks = multiPageSinkFactory.sinks();
+ List<MultiPageSubSink> sinks = multiPageSinkFactory.sinks();
- log.debug("Multipage report: " + sinks.size() + " subreports");
+ log.debug("Multipage report: " + sinks.size() + " subreports");
- for (MultiPageSubSink mySink : sinks) {
- outputName = mySink.getOutputName();
- log.debug(" Rendering " + outputName);
+ for (MultiPageSubSink mySink : sinks) {
+ outputName = mySink.getOutputName();
+ log.debug(" Rendering " + outputName);
- // Create directories if necessary
- if (!mySink.getOutputDir().exists()) {
- mySink.getOutputDir().mkdirs();
- }
+ // Create directories if necessary
+ if (!mySink.getOutputDir().exists()) {
+ mySink.getOutputDir().mkdirs();
+ }
- File outputFile = new File(mySink.getOutputDir(), outputName);
+ File outputFile = new File(mySink.getOutputDir(), outputName);
- try (Writer out = WriterFactory.newWriter(outputFile,
siteRenderingContext.getOutputEncoding())) {
- siteRenderer.mergeDocumentIntoSite(out, mySink,
siteRenderingContext);
+ try (Writer out = WriterFactory.newWriter(outputFile,
siteRenderingContext.getOutputEncoding())) {
+ siteRenderer.mergeDocumentIntoSite(out, mySink,
siteRenderingContext);
+ mySink.close();
+ mySink = null;
+ } finally {
+ if (mySink != null) {
mySink.close();
- mySink = null;
- } finally {
- if (mySink != null) {
- mySink.close();
- }
}
}
- } catch (IOException e) {
- throw new RendererException("Cannot create writer to " +
outputName, e);
}
}
diff --git
a/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java
b/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java
index d08a210a..1536d234 100644
---
a/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java
+++
b/src/main/java/org/apache/maven/plugins/site/render/SitemapDocumentRenderer.java
@@ -18,7 +18,7 @@
*/
package org.apache.maven.plugins.site.render;
-import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.Writer;
import java.util.List;
import java.util.Locale;
@@ -79,7 +79,7 @@ public class SitemapDocumentRenderer implements
SitePluginReportDocumentRenderer
}
public void renderDocument(Writer writer, SiteRenderer siteRenderer,
SiteRenderingContext siteRenderingContext)
- throws RendererException, FileNotFoundException {
+ throws RendererException, IOException {
Locale locale = siteRenderingContext.getLocale();
String msg = "Generating \"" + buffer().strong(title) + "\" report";
