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/01/23 21:22:46 UTC
[maven-reporting-impl] branch master updated: Revert "Prepare for Doxia 2.0.0"
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 b39d162 Revert "Prepare for Doxia 2.0.0"
b39d162 is described below
commit b39d1623a8ef9aea62178ab153b0eb45700582c8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 23 22:22:37 2022 +0100
Revert "Prepare for Doxia 2.0.0"
This reverts commit 26f9664b4b2542438fa95c9feb229b26d7329e53.
---
pom.xml | 6 +++---
src/it/setup-reporting-plugin/pom.xml | 4 ++--
src/it/use-as-site-report/pom.xml | 2 +-
.../apache/maven/reporting/AbstractMavenReport.java | 21 ++++++++++++++++++---
.../reporting/AbstractMavenReportRenderer.java | 9 ++++-----
5 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc417d4..f5234d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
<properties>
<mavenVersion>3.1.0</mavenVersion>
- <doxiaVersion>2.0.0-M1</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <doxiaVersion>1.7</doxiaVersion>
+ <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0</version>
</dependency>
<!-- Maven -->
diff --git a/src/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index ea46099..03fad4e 100644
--- a/src/it/setup-reporting-plugin/pom.xml
+++ b/src/it/setup-reporting-plugin/pom.xml
@@ -46,7 +46,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0</version>
</dependency>
<!-- plugin API and plugin-tools -->
@@ -131,6 +131,6 @@ under the License.
</plugin>
</plugins>
</build>
- </profile>
+ </profile>
</profiles>
</project>
diff --git a/src/it/use-as-site-report/pom.xml b/src/it/use-as-site-report/pom.xml
index ba47e69..0fe7c4a 100644
--- a/src/it/use-as-site-report/pom.xml
+++ b/src/it/use-as-site-report/pom.xml
@@ -37,7 +37,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.10.0</version>
+ <version>3.4</version>
</plugin>
</plugins>
</build>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index a7ea2bc..8a2b3aa 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -132,8 +132,7 @@ public abstract class AbstractMavenReport
siteContext.setLocale( locale );
siteContext.setTemplateProperties( getTemplateProperties() );
- // TODO Replace null with real value
- RenderingContext context = new RenderingContext( outputDirectory, filename, null );
+ RenderingContext context = new RenderingContext( outputDirectory, filename );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -150,7 +149,7 @@ public abstract class AbstractMavenReport
new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, filename ) ),
getOutputEncoding() ) )
{
- getSiteRenderer().mergeDocumentIntoSite( writer, sink, siteContext );
+ getSiteRenderer().generateDocument( writer, sink, siteContext );
}
}
}
@@ -183,6 +182,22 @@ public abstract class AbstractMavenReport
/**
* Generate a report.
*
+ * @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
+ @Override
+ public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
+ throws MavenReportException
+ {
+ generate( sink, null, locale );
+ }
+
+ /**
+ * Generate a report.
+ *
* @param sink
* @param locale
* @throws MavenReportException
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 4c9a07c..5acd06e 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -20,7 +20,6 @@ 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;
@@ -35,11 +34,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>
@@ -447,7 +446,7 @@ public abstract class AbstractMavenReportRenderer
*/
protected void verbatimText( String text )
{
- sink.verbatim( SinkEventAttributeSet.BOXED );
+ sink.verbatim( true );
text( text );
@@ -472,7 +471,7 @@ public abstract class AbstractMavenReportRenderer
}
else
{
- sink.verbatim( SinkEventAttributeSet.BOXED );
+ sink.verbatim( true );
link( href, text );