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/24 12:12:43 UTC

[maven-reporting-impl] 01/02: [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/maven-reporting-impl.git

commit 7c959c428ad687cc2200d6106ab7951fa671fece
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jan 24 12:50:53 2022 +0100

    [MSHARED-1027] Update Doxia to 1.11.1 and Doxia Sitetools to 1.11.1
---
 pom.xml                                                |  9 ++-------
 .../apache/maven/reporting/AbstractMavenReport.java    | 18 +-----------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index f5234d9..93dbb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
 
   <properties>
     <mavenVersion>3.1.0</mavenVersion>
-    <doxiaVersion>1.7</doxiaVersion>
-    <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
+    <doxiaVersion>1.11.1</doxiaVersion>
+    <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
     <javaVersion>7</javaVersion>
     <project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
   </properties>
@@ -120,11 +120,6 @@
       <artifactId>doxia-site-renderer</artifactId>
       <version>${doxiaSitetoolsVersion}</version>
     </dependency>
-    <dependency><!-- TODO remove dependency when upgrading Doxia Sitetools to 1.7.5 -->
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-    </dependency>
 
     <!-- misc -->
     <dependency>
diff --git a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
index 8a2b3aa..1090cd0 100644
--- a/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
+++ b/src/main/java/org/apache/maven/reporting/AbstractMavenReport.java
@@ -182,26 +182,10 @@ 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)
+     * @see org.apache.maven.reporting.MavenReport#generate(Sink, Locale)
      * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
      */
     @Deprecated