diff --git a/spring-data-jpa-distribution/pom.xml b/spring-data-jpa-distribution/pom.xml
index 95ed749af3..453f49dea0 100644
--- a/spring-data-jpa-distribution/pom.xml
+++ b/spring-data-jpa-distribution/pom.xml
@@ -21,15 +21,40 @@
 	<properties>
 		<project.root>${basedir}/..</project.root>
 		<dist.key>DATAJPA</dist.key>
+		<antora.playbook>${project.basedir}/../src/main/antora/antora-playbook.yml</antora.playbook>
 	</properties>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/../src/main/antora/resources/antora-resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>io.spring.maven.antora</groupId>
+				<artifactId>antora-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 
+	<profiles>
+
+		<profile>
+			<id>antora</id>
+			<build>
+				<plugins>
+
+				</plugins>
+			</build>
+		</profile>
+
+	</profiles>
+
 </project>
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 19bc4279e7..b21b03c313 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -21,7 +21,6 @@
 
 	<properties>
 		<java-module-name>spring.data.jpa</java-module-name>
-		<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
 	</properties>
 
 	<dependencies>
@@ -431,29 +430,6 @@
 				</configuration>
 			</plugin>
 
-
-
-			<plugin>
-				<groupId>io.spring.maven.antora</groupId>
-				<artifactId>antora-maven-plugin</artifactId>
-				<version>${io.spring.maven.antora-version}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<playbook>src/main/antora/antora-playbook.yml</playbook>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>io.spring.maven.antora</groupId>
-				<artifactId>antora-component-version-maven-plugin</artifactId>
-				<version>${io.spring.maven.antora-version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>antora-component-version</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/spring-data-jpa/src/main/antora/antora.yml b/spring-data-jpa/src/main/antora/antora.yml
deleted file mode 100644
index b728d86ef6..0000000000
--- a/spring-data-jpa/src/main/antora/antora.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: data-jpa
-version: true
-title: Spring Data JPA
-nav:
-  - modules/ROOT/nav.adoc
-ext:
-  collector:
-  - run:
-      command: mvnw validate resources:resources -pl :spring-data-jpa -am
-      local: true
-    scan:
-      dir: spring-data-jpa/target/classes/antora-resources
diff --git a/spring-data-jpa/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml
similarity index 91%
rename from spring-data-jpa/src/main/antora/antora-playbook.yml
rename to src/main/antora/antora-playbook.yml
index f234b092a3..12ac5adfb4 100644
--- a/spring-data-jpa/src/main/antora/antora-playbook.yml
+++ b/src/main/antora/antora-playbook.yml
@@ -11,9 +11,9 @@ site:
   url: https://docs.spring.io/spring-data-jpa/reference/
 content:
   sources:
-    - url: ./../../../..
+    - url: ./../../..
       branches: HEAD
-      start_path: spring-data-jpa/src/main/antora
+      start_path: src/main/antora
       worktrees: true
 asciidoc:
   attributes:
@@ -34,4 +34,4 @@ runtime:
 ui:
   bundle:
     url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.3/ui-bundle.zip
-    snapshot: true
\ No newline at end of file
+    snapshot: true
diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
new file mode 100644
index 0000000000..68f27da5f3
--- /dev/null
+++ b/src/main/antora/antora.yml
@@ -0,0 +1,12 @@
+name: data-jpa
+version: true
+title: Spring Data JPA
+nav:
+  - modules/ROOT/nav.adoc
+ext:
+  collector:
+  - run:
+      command: ./mvnw validate process-resources -pl :spring-data-jpa-distribution -am -Pantora-process-resources
+      local: true
+    scan:
+      dir: spring-data-jpa-distribution/target/classes/
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/nav.adoc
rename to src/main/antora/modules/ROOT/nav.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/envers.adoc b/src/main/antora/modules/ROOT/pages/envers.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/envers.adoc
rename to src/main/antora/modules/ROOT/pages/envers.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/faq.adoc b/src/main/antora/modules/ROOT/pages/faq.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/faq.adoc
rename to src/main/antora/modules/ROOT/pages/faq.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/glossary.adoc b/src/main/antora/modules/ROOT/pages/glossary.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/glossary.adoc
rename to src/main/antora/modules/ROOT/pages/glossary.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/index.adoc b/src/main/antora/modules/ROOT/pages/index.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/index.adoc
rename to src/main/antora/modules/ROOT/pages/index.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa.adoc b/src/main/antora/modules/ROOT/pages/jpa.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa.adoc
rename to src/main/antora/modules/ROOT/pages/jpa.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc b/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/auditing.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc b/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc b/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/introduction.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc b/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/locking.adoc b/src/main/antora/modules/ROOT/pages/jpa/locking.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/locking.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/locking.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc b/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc b/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc b/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc b/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc b/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/specifications.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc b/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc
diff --git a/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc b/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc
similarity index 100%
rename from spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc
rename to src/main/antora/modules/ROOT/pages/jpa/transactions.adoc
diff --git a/spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
similarity index 81%
rename from spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml
rename to src/main/antora/resources/antora-resources/antora.yml
index b17d78e0d8..f42c5ef7af 100644
--- a/spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -4,10 +4,10 @@ prerelease: ${antora-component.prerelease}
 asciidoc:
   attributes:
     version: ${project.version}
-    springversionshort: 6.1
+    springversionshort: ${spring.short}
     springversion: ${spring}
     attribute-missing: 'warn'
     spring-data-commons-docs-url: https://docs.spring.io/spring-data-commons/reference
-    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/data-commons/docs/current/api/
+    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
     springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
-    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
\ No newline at end of file
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api