File tree Expand file tree Collapse file tree 4 files changed +9
-13
lines changed
main/java/org/asciidoctor/maven/site Expand file tree Collapse file tree 4 files changed +9
-13
lines changed Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ Bug Fixes::
22
22
23
23
* Exclude dot files and folders from conversion (#555)
24
24
* Fix `StringIndexOutOfBoundsException` parsing log records when cursor file is above source directory (#563)
25
+ * Fix build failing with maven-site-plugin v3.10.0 (#566)
25
26
26
27
Build / Infrastructure::
27
28
Original file line number Diff line number Diff line change 76
76
<plexus .utils.version>3.0.23</plexus .utils.version>
77
77
<plexus .component.metadata.version>1.7</plexus .component.metadata.version>
78
78
<netty .version>4.1.71.Final</netty .version>
79
- <doxia .version>1.8 </doxia .version>
79
+ <doxia .version>1.10 </doxia .version>
80
80
</properties >
81
81
82
82
<dependencyManagement >
143
143
<artifactId >doxia-core</artifactId >
144
144
<version >${doxia.version} </version >
145
145
</dependency >
146
- <dependency >
147
- <groupId >org.apache.maven.doxia</groupId >
148
- <artifactId >doxia-module-xhtml</artifactId >
149
- <version >${doxia.version} </version >
150
- </dependency >
151
146
<dependency >
152
147
<groupId >org.junit.jupiter</groupId >
153
148
<artifactId >junit-jupiter</artifactId >
Original file line number Diff line number Diff line change 15
15
<build >
16
16
<plugins >
17
17
<!--
18
- Workaround to prevent `java.lang.ClassNotFoundException: org.apache.maven.doxia.siterenderer.DocumentContent`
18
+ Up to v2.2.1, use v2.8.1 as workaround to prevent `java.lang.ClassNotFoundException: org.apache.maven.doxia.siterenderer.DocumentContent`
19
19
with `maven-site-plugin` v3.6 or lower.
20
20
This only affects the it tests, normal executions (e.g. in asciidoctor-maven-examples) work fine.
21
21
-->
22
22
<plugin >
23
23
<groupId >org.apache.maven.plugins</groupId >
24
24
<artifactId >maven-project-info-reports-plugin</artifactId >
25
- <version >2.8.1 </version >
25
+ <version >3.1.2 </version >
26
26
</plugin >
27
27
<!-- tag::plugin-decl[] -->
28
28
<plugin >
29
29
<groupId >org.apache.maven.plugins</groupId >
30
30
<artifactId >maven-site-plugin</artifactId >
31
- <!-- doxia 1.7 is only compatible with maven-site-plugin 3.4 or + -->
32
- <version >3.4 </version >
31
+ <!-- v2.2.2 of the plugin require Maven Site Plugin doxia 3.10.6 alongside Doxia 1.11.1 -->
32
+ <version >3.10.0 </version >
33
33
<configuration >
34
34
<asciidoc >
35
35
<baseDir >${project.basedir} /src/site/asciidoc</baseDir >
Original file line number Diff line number Diff line change 1
1
package org .asciidoctor .maven .site ;
2
2
3
- import org .apache .maven .doxia .module . xhtml . XhtmlParser ;
3
+ import org .apache .maven .doxia .parser . AbstractTextParser ;
4
4
import org .apache .maven .doxia .parser .ParseException ;
5
5
import org .apache .maven .doxia .parser .Parser ;
6
6
import org .apache .maven .doxia .sink .Sink ;
31
31
* @author mojavelinux
32
32
*/
33
33
@ Component (role = Parser .class , hint = AsciidoctorDoxiaParser .ROLE_HINT )
34
- public class AsciidoctorDoxiaParser extends XhtmlParser {
34
+ public class AsciidoctorDoxiaParser extends AbstractTextParser {
35
35
36
36
@ Inject
37
37
protected Provider <MavenProject > mavenProjectProvider ;
@@ -45,7 +45,7 @@ public class AsciidoctorDoxiaParser extends XhtmlParser {
45
45
* {@inheritDoc}
46
46
*/
47
47
@ Override
48
- public void parse (Reader reader , Sink sink ) throws ParseException {
48
+ public void parse (Reader reader , Sink sink , String reference ) throws ParseException {
49
49
String source ;
50
50
try {
51
51
if ((source = IOUtil .toString (reader )) == null ) {
You can’t perform that action at this time.
0 commit comments