diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 733f25b8..d8da79fb 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -22,6 +22,7 @@ Bug Fixes:: * Exclude dot files and folders from conversion (#555) * Fix `StringIndexOutOfBoundsException` parsing log records when cursor file is above source directory (#563) + * Fix compatibility with maven-site-plugin v3.10.0 (previous versions no longer supported) (https://github.com/michael-o[@michael-o]) (#566) Build / Infrastructure:: diff --git a/pom.xml b/pom.xml index 16acb103..2ce8f822 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ 3.0.23 1.7 4.1.71.Final - 1.8 + 1.10 @@ -143,11 +143,6 @@ doxia-core ${doxia.version} - - org.apache.maven.doxia - doxia-module-xhtml - ${doxia.version} - org.junit.jupiter junit-jupiter diff --git a/src/it/maven-site-plugin/pom.xml b/src/it/maven-site-plugin/pom.xml index e24051b1..328de3c0 100644 --- a/src/it/maven-site-plugin/pom.xml +++ b/src/it/maven-site-plugin/pom.xml @@ -15,21 +15,21 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8.1 + 3.1.2 org.apache.maven.plugins maven-site-plugin - - 3.4 + + 3.10.0 ${project.basedir}/src/site/asciidoc diff --git a/src/main/java/org/asciidoctor/maven/site/AsciidoctorDoxiaParser.java b/src/main/java/org/asciidoctor/maven/site/AsciidoctorDoxiaParser.java index cb10f868..65ee0c82 100644 --- a/src/main/java/org/asciidoctor/maven/site/AsciidoctorDoxiaParser.java +++ b/src/main/java/org/asciidoctor/maven/site/AsciidoctorDoxiaParser.java @@ -1,6 +1,6 @@ package org.asciidoctor.maven.site; -import org.apache.maven.doxia.module.xhtml.XhtmlParser; +import org.apache.maven.doxia.parser.AbstractTextParser; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; @@ -31,7 +31,7 @@ * @author mojavelinux */ @Component(role = Parser.class, hint = AsciidoctorDoxiaParser.ROLE_HINT) -public class AsciidoctorDoxiaParser extends XhtmlParser { +public class AsciidoctorDoxiaParser extends AbstractTextParser { @Inject protected Provider mavenProjectProvider; @@ -45,7 +45,7 @@ public class AsciidoctorDoxiaParser extends XhtmlParser { * {@inheritDoc} */ @Override - public void parse(Reader reader, Sink sink) throws ParseException { + public void parse(Reader reader, Sink sink, String reference) throws ParseException { String source; try { if ((source = IOUtil.toString(reader)) == null) {