From ae6a6d127b1a405bfb571811c47b9e30eb2eb5ed Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Sat, 6 Aug 2022 23:11:16 +0200
Subject: [PATCH] [MSHARED-1120] Upgrade Maven Reporting API to 3.1.1

---
 pom.xml                                                      | 5 +++--
 src/it/setup-reporting-plugin/pom.xml                        | 2 +-
 .../java/org/apache/maven/reporting/AbstractMavenReport.java | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 007a116..404b78f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,10 +68,11 @@
   </distributionManagement>
 
   <properties>
+    <javaVersion>7</javaVersion>
     <mavenVersion>3.1.0</mavenVersion>
     <doxiaVersion>1.11.1</doxiaVersion>
     <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
-    <javaVersion>7</javaVersion>
+    <reportingApiVersion>3.1.1</reportingApiVersion>
     <project.build.outputTimestamp>2022-02-05T21:36:19Z</project.build.outputTimestamp>
   </properties>
 
@@ -79,7 +80,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.0</version>
+      <version>${reportingApiVersion}</version>
     </dependency>
 
     <!-- Maven -->
diff --git a/src/it/setup-reporting-plugin/pom.xml b/src/it/setup-reporting-plugin/pom.xml
index c7a3191..a3ff962 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</version>
+      <version>@reportingApiVersion@</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 e1279e8..cdb9a0b 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -189,6 +189,7 @@ private Map<String, Object> getTemplateProperties()
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated
+    @Override
     public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
         throws MavenReportException
     {
@@ -204,7 +205,6 @@ public void generate( org.codehaus.doxia.sink.Sink sink, Locale locale )
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated
-    @Override
     public void generate( Sink sink, Locale locale )
         throws MavenReportException
     {