You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:16:21 UTC
[maven-reporting-impl] 01/01: mvn4 aggregator
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git
commit 750577adf2bd903961d25ef142ec5cace45b7c7c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:16:18 2022 +0100
mvn4 aggregator
---
pom.xml | 14 +++++++-------
src/it/setup-reporting-plugin/pom.xml | 2 +-
.../org/apache/maven/reporting/AbstractMavenReport.java | 17 -----------------
.../maven/reporting/AbstractMavenReportRenderer.java | 8 ++++----
4 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index f5234d9..6aabb07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -68,10 +68,10 @@
</distributionManagement>
<properties>
- <mavenVersion>3.1.0</mavenVersion>
- <doxiaVersion>1.7</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
- <javaVersion>7</javaVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <javaVersion>8</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.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.3</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<!-- Doxia -->
diff --git a/src/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index 03fad4e..61b5c0b 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.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- plugin API and plugin-tools -->
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 8a2b3aa..016b455 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -182,26 +182,9 @@ 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
- * @see org.apache.maven.reporting.MavenReport#generate(org.codehaus.doxia.sink.Sink, Locale)
* @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
*/
@Deprecated
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
index 5acd06e..5491fab 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
@@ -441,12 +441,12 @@ public abstract class AbstractMavenReportRenderer
*
* @param text a text, could be null.
* @see #text(String)
- * @see Sink#verbatim(boolean)
+ * @see Sink#verbatim()
* @see Sink#verbatim_()
*/
protected void verbatimText( String text )
{
- sink.verbatim( true );
+ sink.verbatim( null );
text( text );
@@ -460,7 +460,7 @@ public abstract class AbstractMavenReportRenderer
* @param href an href could be null
* @see #link(String, String)
* @see #verbatimText(String)
- * @see Sink#verbatim(boolean)
+ * @see Sink#verbatim()
* @see Sink#verbatim_()
*/
protected void verbatimLink( String text, String href )
@@ -471,7 +471,7 @@ public abstract class AbstractMavenReportRenderer
}
else
{
- sink.verbatim( true );
+ sink.verbatim( null );
link( href, text );