Skip to content

Commit c543e01

Browse files
authored
Fix the Asciidoc build (#411)
1 parent 95f88c4 commit c543e01

16 files changed

+35
-37
lines changed

pom.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<plugin>
160160
<groupId>org.asciidoctor</groupId>
161161
<artifactId>asciidoctor-maven-plugin</artifactId>
162-
<version>2.2.3</version>
162+
<version>3.0.0</version>
163163
<executions>
164164
<execution>
165165
<id>generate-docs</id>
@@ -172,12 +172,14 @@
172172
<configuration>
173173
<backend>html5</backend>
174174
<!--preserveDirectories>true</preserveDirectories-->
175-
<imagesDir>images</imagesDir>
176175
<sourceDirectory>${basedir}/target/docs</sourceDirectory>
177176
<sourceDocumentName>index.adoc</sourceDocumentName>
178177
<outputDirectory>${basedir}/docs</outputDirectory>
179178
<attributes>
180179
<neo4j-version>${project.version}</neo4j-version>
180+
<imagesdir>images</imagesdir>
181+
<source-highlighter>coderay</source-highlighter>
182+
<coderay-css>style</coderay-css>
181183
</attributes>
182184
<requires>
183185
<require>asciidoctor-diagram</require>
@@ -204,17 +206,13 @@
204206
</includes>
205207
</resource>
206208
</resources>
207-
<source-highlighter>coderay</source-highlighter>
208-
<coderay-css>style</coderay-css>
209-
<requires>
210-
<require>asciidoctor-diagram</require>
211-
</requires>
209+
<requires>asciidoctor-diagram</requires>
212210
</configuration>
213211
<dependencies>
214212
<dependency>
215213
<groupId>org.asciidoctor</groupId>
216214
<artifactId>asciidoctorj-diagram</artifactId>
217-
<version>2.2.1</version>
215+
<version>2.3.0</version>
218216
</dependency>
219217
</dependencies>
220218
</plugin>

src/docs/conf/asciidoc.local.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
imagesdir=images
33
iconsdir=icons
44
imagestargetdir=target/src/images
5-
fontsdir=target/tools/bin/fonts
5+
fontsdir=target/tools/bin/fonts

src/docs/dev/appendix.txt renamed to src/docs/dev/appendix.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
:leveloffset: 1
44

5-
include::udig.txt[]
5+
include::udig.adoc[]
66

77
:leveloffset: 1
88

9-
include::geoserver.txt[]
9+
include::geoserver.adoc[]
1010

1111
:leveloffset: 1
1212

13-
include::geoserver2.txt[]
13+
include::geoserver2.adoc[]
1414

src/docs/dev/examples.txt renamed to src/docs/dev/examples.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,5 @@ image::equalLayer.png[]
9696

9797
:leveloffset: 2
9898

99-
include::geo-pipes.txt[]
99+
include::geo-pipes.adoc[]
100100

File renamed without changes.
File renamed without changes.
File renamed without changes.

src/docs/dev/index.adoc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2+
:leveloffset: 1
3+
4+
include::indexing.adoc[]
5+
6+
:leveloffset: 1
7+
8+
include::layers.adoc[]
9+
10+
:leveloffset: 1
11+
12+
include::procedures.adoc[]
13+
14+
:leveloffset: 1
15+
16+
include::querying.adoc[]
17+
18+
:leveloffset: 1
19+
20+
include::examples.adoc[]
21+

src/docs/dev/index.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/docs/index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
:leveloffset: 1
1010

11-
include::dev/introduction.txt[]
11+
include::dev/introduction.adoc[]
1212

1313
:leveloffset: 1
1414

15-
include::dev/index.txt[]
15+
include::dev/index.adoc[]
1616

1717
:leveloffset: 1
1818

19-
include::dev/appendix.txt[]
19+
include::dev/appendix.adoc[]
2020

2121

0 commit comments

Comments
 (0)