diff --git a/src/main/antora/modules/ROOT/partials/id-generation.adoc b/src/main/antora/modules/ROOT/partials/id-generation.adoc
index e4f91b831..344bcd26a 100644
--- a/src/main/antora/modules/ROOT/partials/id-generation.adoc
+++ b/src/main/antora/modules/ROOT/partials/id-generation.adoc
@@ -2,7 +2,7 @@
 == ID Generation
 
 Spring Data uses the identifer property to identify entities.
-The ID of an entity must be annotated with Spring Data's https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/annotation/Id.html[`@Id`] annotation.
+The ID of an entity must be annotated with Spring Data's {spring-data-commons-javadoc-base}/org/springframework/data/annotation/Id.html[`@Id`] annotation.
 
 When your database has an auto-increment column for the ID column, the generated value gets set in the entity after inserting it into the database.
 
diff --git a/src/main/antora/modules/ROOT/partials/optimistic-locking.adoc b/src/main/antora/modules/ROOT/partials/optimistic-locking.adoc
index 5819ce417..2ba4faeb6 100644
--- a/src/main/antora/modules/ROOT/partials/optimistic-locking.adoc
+++ b/src/main/antora/modules/ROOT/partials/optimistic-locking.adoc
@@ -1,5 +1,5 @@
 Spring Data supports optimistic locking by means of a numeric attribute that is annotated with
-https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/annotation/Version.html[`@Version`] on the aggregate root.
+{spring-data-commons-javadoc-base}/org/springframework/data/annotation/Version.html[`@Version`] on the aggregate root.
 Whenever Spring Data saves an aggregate with such a version attribute two things happen:
 
 * The update statement for the aggregate root will contain a where clause checking that the version stored in the database is actually unchanged.
diff --git a/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
index b4c60f697..44ac0f3c6 100644
--- a/src/main/antora/resources/antora-resources/antora.yml
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -3,20 +3,21 @@ prerelease: ${antora-component.prerelease}
 
 asciidoc:
   attributes:
-    copyright-year: ${current.year}
+    attribute-missing: 'warn'
+    chomp: 'all'
     version: ${project.version}
+    copyright-year: ${current.year}
     springversionshort: ${spring.short}
     springversion: ${spring}
-    attribute-missing: 'warn'
     commons: ${springdata.commons.docs}
     include-xml-namespaces: false
-    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference
-    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
-    spring-data-jdbc-javadoc: https://docs.spring.io/spring-data/jdbc/docs/${version}/api/
-    spring-data-r2dbc-javadoc: https://docs.spring.io/spring-data/r2dbc/docs/${version}/api/
+    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference/{commons}
+    spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
+    spring-data-jdbc-javadoc: https://docs.spring.io/spring-data/relational/reference/{version}/api/java
+    spring-data-r2dbc-javadoc: '{spring-data-jdbc-javadoc}'
     springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
-    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
     spring-framework-docs: '{springdocsurl}'
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
     spring-framework-javadoc: '{springjavadocurl}'
     springhateoasversion: ${spring-hateoas}
     releasetrainversion: ${releasetrain}