diff --git a/.gitignore b/.gitignore
index b86bc9b13..ab8bf0532 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,4 @@ src/ant/.ant-targets-upload-dist.xml
 node
 node_modules
 package-lock.json
-package.json
 .mvn/.gradle-enterprise
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..057a40fe8
--- /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 f4e7bace5..e352308b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,7 +340,7 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>io.spring.maven.antora</groupId>
+				<groupId>org.antora</groupId>
 				<artifactId>antora-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
diff --git a/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml
index 76ec752fb..730c7d3da 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-commons'
 site:
   title: Spring Data Reference
@@ -17,13 +16,12 @@ content:
       worktrees: true
 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: ''
@@ -33,5 +31,5 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.3/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 f48c7417a..4ab2802b6 100644
--- a/src/main/antora/antora.yml
+++ b/src/main/antora/antora.yml
@@ -10,3 +10,8 @@ ext:
         local: true
       scan:
         dir: target/classes/antora-resources/
+    - 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 d5cd181f8..7debd53d1 100644
--- a/src/main/antora/modules/ROOT/nav.adoc
+++ b/src/main/antora/modules/ROOT/nav.adoc
@@ -30,3 +30,6 @@
 ** xref:repositories/populator-namespace-reference.adoc[]
 ** xref:repositories/query-keywords-reference.adoc[]
 ** xref:repositories/query-return-types-reference.adoc[]
+
+* 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]