From 35fc61e158aef235c2b7760e53c6d05c0529ab54 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Mon, 24 Jan 2022 11:25:22 +0100 Subject: [PATCH] [MSHARED-1024] Replace deprecated code * Stop using the deprecated Codehaus Doxia Sink, use Maven Doxia Sink since the Codehaus one extends from Maven code should continue to work. * Don't use expressions, use XML constructs This closes #2 --- .../java/org/apache/maven/reporting/MavenMultiPageReport.java | 2 +- src/main/java/org/apache/maven/reporting/MavenReport.java | 4 ++-- src/main/resources/default-report.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java index 4c8e6ec..65ab172 100644 --- a/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java +++ b/src/main/java/org/apache/maven/reporting/MavenMultiPageReport.java @@ -30,7 +30,7 @@ * method dropped. But that would have rendered all reporting mojo's uncompilable and binary incompatible. * * @author Kenney Westerhof - * @see MavenReport#generate(org.codehaus.doxia.sink.Sink, Locale) + * @see MavenReport#generate(Sink, Locale) * @since 3.0 (copied in maven-site-plugin 2.0-beta-6) */ public interface MavenMultiPageReport diff --git a/src/main/java/org/apache/maven/reporting/MavenReport.java b/src/main/java/org/apache/maven/reporting/MavenReport.java index 0ca6086..52d8e47 100644 --- a/src/main/java/org/apache/maven/reporting/MavenReport.java +++ b/src/main/java/org/apache/maven/reporting/MavenReport.java @@ -19,11 +19,11 @@ * under the License. */ -import org.codehaus.doxia.sink.Sink; - import java.io.File; import java.util.Locale; +import org.apache.maven.doxia.sink.Sink; + /** * The basis for a Maven report. * diff --git a/src/main/resources/default-report.xml b/src/main/resources/default-report.xml index dde8d0d..7b4ecd1 100644 --- a/src/main/resources/default-report.xml +++ b/src/main/resources/default-report.xml @@ -20,6 +20,6 @@ under the License. - ${reports} +