[MSHARED-1120] Upgrade Maven Reporting API to 3.1.1

apache · Aug 6, 2022 · ae6a6d1 · ae6a6d1
1 parent b3f28da
commit ae6a6d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,18 +68,19 @@
   </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>
 
   <dependencies>
     <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
@@ -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
@@ -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
     {