Skip to content

Commit 36b0536

Browse files
committed
Bundle Javadoc with Antora documentation site.
Closes #2930
1 parent 8fc8c75 commit 36b0536

File tree

6 files changed

+23
-9
lines changed

6 files changed

+23
-9
lines changed

Diff for: .gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dependency-reduced-pom.xml
3636
build/
3737
node_modules
3838
node
39-
package.json
4039
package-lock.json
4140
.mvn/.gradle-enterprise
4241

Diff for: package.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"dependencies": {
3+
"antora": "3.2.0-alpha.6",
4+
"@antora/atlas-extension": "1.0.0-alpha.2",
5+
"@antora/collector-extension": "1.0.0-alpha.7",
6+
"@asciidoctor/tabs": "1.0.0-beta.6",
7+
"@springio/antora-extensions": "1.13.0",
8+
"@springio/asciidoctor-extensions": "1.0.0-alpha.11"
9+
}
10+
}

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@
750750
<build>
751751
<plugins>
752752
<plugin>
753-
<groupId>io.spring.maven.antora</groupId>
753+
<groupId>org.antora</groupId>
754754
<artifactId>antora-maven-plugin</artifactId>
755755
</plugin>
756756
</plugins>

Diff for: src/main/antora/antora-playbook.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
# The purpose of this Antora playbook is to build the docs in the current branch.
44
antora:
55
extensions:
6-
- '@antora/collector-extension'
7-
- require: '@springio/antora-extensions/root-component-extension'
6+
- require: '@springio/antora-extensions'
87
root_component_name: 'data-neo4j'
98
site:
109
title: Spring Data Neo4j
@@ -22,13 +21,12 @@ content:
2221
start_path: src/main/antora
2322
asciidoc:
2423
attributes:
25-
page-pagination: ''
2624
hide-uri-scheme: '@'
2725
tabs-sync-option: '@'
28-
chomp: 'all'
2926
extensions:
3027
- '@asciidoctor/tabs'
3128
- '@springio/asciidoctor-extensions'
29+
- '@springio/asciidoctor-extensions/javadoc-extension'
3230
sourcemap: true
3331
urls:
3432
latest_version_segment: ''
@@ -38,5 +36,5 @@ runtime:
3836
format: pretty
3937
ui:
4038
bundle:
41-
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
39+
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
4240
snapshot: true

Diff for: src/main/antora/antora.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ ext:
99
command: ./mvnw validate process-resources -am -Pantora-process-resources
1010
local: true
1111
scan:
12-
dir: target/classes/
12+
dir: target/classes/
13+
- run:
14+
command: ./mvnw package -Pdistribute
15+
local: true
16+
scan:
17+
dir: target/antora

Diff for: src/main/antora/modules/ROOT/nav.adoc

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@
4848
** xref:appendix/migrating.adoc[]
4949
** xref:appendix/build.adoc[]
5050
51-
* https://github.com/spring-projects/spring-data-commons/wiki[Wiki]
51+
52+
* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
53+
* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]

0 commit comments

Comments
 (0)