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/02/05 20:06:27 UTC
[maven-reporting-impl] 01/03: [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit b3b09afb4007ca3d76a89508a468f96eff03c804
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:50:53 2022 +0100
[MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
---
pom.xml | 9 ++-------
.../java/org/apache/maven/reporting/AbstractMavenReport.java | 5 +++--
.../org/apache/maven/reporting/AbstractMavenReportRenderer.java | 9 +++++----
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5234d9..93dbb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
<properties>
<mavenVersion>3.1.0</mavenVersion>
- <doxiaVersion>1.7</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
+ <doxiaVersion>1.11.1</doxiaVersion>
+ <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -120,11 +120,6 @@
<artifactId>doxia-site-renderer</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>
- <dependency><!-- TODO remove dependency when upgrading Doxia Sitetools to 1.7.5 -->
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
<!-- misc -->
<dependency>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 8a2b3aa..4dc0736 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -132,7 +132,8 @@ public abstract class AbstractMavenReport
siteContext.setLocale( locale );
siteContext.setTemplateProperties( getTemplateProperties() );
- RenderingContext context = new RenderingContext( outputDirectory, filename );
+ // TODO Replace null with real value
+ RenderingContext context = new RenderingContext( outputDirectory, filename, null );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -149,7 +150,7 @@ public abstract class AbstractMavenReport
new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ),
getOutputEncoding() ) )
{
- getSiteRenderer().generateDocument( writer, sink, siteContext );
+ getSiteRenderer().mergeDocumentIntoSite( writer, sink, siteContext );
}
}
}
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 5acd06e..4c9a07c 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -20,6 +20,7 @@ package org.apache.maven.reporting;
*/
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.shared.utils.StringUtils;
@@ -34,11 +35,11 @@ import java.util.Properties;
/**
* <p>An abstract class to manage report generation, with many helper methods to ease the job: you just need to
* implement getTitle() and renderBody().</p>
- *
+ *
* <p><strong>TODO</strong> Later it may be appropriate to create something like a VelocityMavenReportRenderer
* that could take a velocity template and pipe that through Doxia rather than coding them
* up like this.</p>
- *
+ *
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@@ -446,7 +447,7 @@ public abstract class AbstractMavenReportRenderer
*/
protected void verbatimText( String text )
{
- sink.verbatim( true );
+ sink.verbatim( SinkEventAttributeSet.BOXED );
text( text );
@@ -471,7 +472,7 @@ public abstract class AbstractMavenReportRenderer
}
else
{
- sink.verbatim( true );
+ sink.verbatim( SinkEventAttributeSet.BOXED );
link( href, text );