From 7f1da244ec555a3a82dffc221128b6829bfb6aa2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 31 Jul 2024 09:36:52 +0200
Subject: [PATCH] Bundle Javadoc with Antora documentation site.

Closes #585
---
 .gitignore                            |  1 -
 package.json                          | 10 ++++++++++
 pom.xml                               |  2 +-
 src/main/antora/antora-playbook.yml   |  8 +++-----
 src/main/antora/antora.yml            |  5 +++++
 src/main/antora/modules/ROOT/nav.adoc |  4 +++-
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 6cffbf0..5387fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ target/
 /.idea/
 node_modules
 node
-package.json
 package-lock.json
 build/
 .mvn/.gradle-enterprise
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..057a40f
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.6",
+    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/collector-extension": "1.0.0-alpha.7",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.13.0",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.11"
+  }
+}
diff --git a/pom.xml b/pom.xml
index 968c304..791ff43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
+						<groupId>org.antora</groupId>
 						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
diff --git a/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml
index 82d3d16..619cdaf 100644
--- a/src/main/antora/antora-playbook.yml
+++ b/src/main/antora/antora-playbook.yml
@@ -3,8 +3,7 @@
 # The purpose of this Antora playbook is to build the docs in the current branch.
 antora:
   extensions:
-    - '@antora/collector-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-keyvalue'
 site:
   title: Spring Data KeyValue
@@ -22,13 +21,12 @@ content:
       start_path: src/main/antora
 asciidoc:
   attributes:
-    page-pagination: ''
     hide-uri-scheme: '@'
     tabs-sync-option: '@'
-    chomp: 'all'
   extensions:
     - '@asciidoctor/tabs'
     - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/javadoc-extension'
   sourcemap: true
 urls:
   latest_version_segment: ''
@@ -38,5 +36,5 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.5/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
     snapshot: true
diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
index 23deed7..5f92dc1 100644
--- a/src/main/antora/antora.yml
+++ b/src/main/antora/antora.yml
@@ -10,3 +10,8 @@ ext:
         local: true
       scan:
         dir: target/classes/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
diff --git a/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc
index 3b315c3..0f5bc8c 100644
--- a/src/main/antora/modules/ROOT/nav.adoc
+++ b/src/main/antora/modules/ROOT/nav.adoc
@@ -10,4 +10,6 @@
 ** xref:repositories/query-keywords-reference.adoc[]
 ** xref:repositories/query-return-types-reference.adoc[]
 
-* https://github.com/spring-projects/spring-data-commons/wiki[Wiki]
+* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]
+