You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/08/10 19:42:15 UTC
[maven-reporting-impl] branch master updated: Sync with 3.x branch
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-reporting-impl.git
The following commit(s) were added to refs/heads/master by this push:
new b1cb404 Sync with 3.x branch
b1cb404 is described below
commit b1cb40422faf1e1055f068122c08f23902618c7b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Aug 10 21:42:03 2022 +0200
Sync with 3.x branch
---
.../apache/maven/reporting/AbstractMavenReport.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 0c00205..edc8b68 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -174,7 +174,7 @@ public abstract class AbstractMavenReport
SiteRenderingContext siteContext = createSiteRenderingContext( locale );
// copy resources
- siteRenderer.copyResources( siteContext, outputDirectory );
+ getSiteRenderer().copyResources( siteContext, outputDirectory );
// TODO Replace null with real value
RenderingContext docRenderingContext = new RenderingContext( outputDirectory, filename, null );
@@ -197,7 +197,7 @@ public abstract class AbstractMavenReport
}
// copy generated resources also
- siteRenderer.copyResources( siteContext, outputDirectory );
+ getSiteRenderer().copyResources( siteContext, outputDirectory );
}
catch ( RendererException | IOException | MavenReportException e )
{
@@ -227,11 +227,11 @@ public abstract class AbstractMavenReport
SiteRenderingContext context;
try
{
- Artifact skinArtifact =
- siteTool.getSkinArtifactFromRepository( localRepository, remoteRepositories, decorationModel );
+ Artifact skinArtifact =
+ siteTool.getSkinArtifactFromRepository( localRepository, remoteRepositories, decorationModel );
- getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
- + " skin" ).a( '.' ).toString() );
+ getLog().info( buffer().a( "Rendering content with " ).strong( skinArtifact.getId()
+ + " skin" ).a( '.' ).toString() );
context = siteRenderer.createContextForSkin( skinArtifact, templateProperties, decorationModel,
project.getName(), locale );
@@ -254,9 +254,9 @@ public abstract class AbstractMavenReport
/**
* Generate a report.
*
- * @param sink
- * @param locale
- * @throws MavenReportException
+ * @param sink the sink to use for the generation.
+ * @param locale the wanted locale to generate the report, could be null.
+ * @throws MavenReportException if any
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated