From f83b2d1180fad6032a795919f4e7c0b7744168e6 Mon Sep 17 00:00:00 2001
From: Philippe Marschall <philippe.marschall@gmail.com>
Date: Sun, 25 Jun 2017 13:47:03 +0200
Subject: [PATCH] MJAVADOC-486 Upgrade to Doxia 1.7

Patch for https://issues.apache.org/jira/browse/MJAVADOC-486
---
 maven-javadoc-plugin/pom.xml                                  | 4 ++--
 .../java/org/apache/maven/plugin/javadoc/JavadocReport.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-javadoc-plugin/pom.xml b/maven-javadoc-plugin/pom.xml
index 1f268eafcf..31906ed943 100644
--- a/maven-javadoc-plugin/pom.xml
+++ b/maven-javadoc-plugin/pom.xml
@@ -62,8 +62,8 @@ under the License.
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
-    <doxiaVersion>1.4</doxiaVersion>
-    <doxia-sitetoolsVersion>1.4</doxia-sitetoolsVersion>
+    <doxiaVersion>1.7</doxiaVersion>
+    <doxia-sitetoolsVersion>1.7.4</doxia-sitetoolsVersion>
     <wagonVersion>1.0-beta-6</wagonVersion>
     <!-- for ITs -->
     <sitePluginVersion>3.3</sitePluginVersion>
diff --git a/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java b/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
index 24a553a862..ee0eadb449 100644
--- a/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
+++ b/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.ResourceBundle;
 
-import org.apache.maven.doxia.sink.render.RenderingContext;
+import org.apache.maven.doxia.siterenderer.RenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;