Merge pull request #225 from Tibor17/master

Upgrade to doxia 1.8
mojohaus · Feb 3, 2019 · 59b3703 · 59b3703
2 parents 90577bd + e7de9b3
commit 59b3703
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,9 @@
 
     <processorVersion>1.3</processorVersion>
 
-    <doxiaVersion>1.6</doxiaVersion>
+    <doxiaVersion>1.8</doxiaVersion>
+    <!-- ASF project maven-doxia-sitetools:1.8.1 has different release cycle and it is dependent on maven-doxia:1.8 -->
+    <doxiaRendererVersion>1.8.1</doxiaRendererVersion>
     <it.debug>true</it.debug>
 
     <version.httpcomponents.httpclient>4.5.4</version.httpcomponents.httpclient>
@@ -213,7 +215,7 @@
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaVersion}</version>
+      <version>${doxiaRendererVersion}</version>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>
@@ -223,10 +225,6 @@
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>dom4j</groupId>
-          <artifactId>dom4j</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>antlr</groupId>
           <artifactId>antlr</artifactId>

diff --git a/src/main/java/org/codehaus/mojo/license/AbstractLicenseReportRenderer.java b/src/main/java/org/codehaus/mojo/license/AbstractLicenseReportRenderer.java
@@ -24,7 +24,7 @@
 
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.codehaus.mojo.license.api.ThirdPartyDetails;