diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
index f48c7417ac..3397a49281 100644
--- a/src/main/antora/antora.yml
+++ b/src/main/antora/antora.yml
@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     - run:
-        command: ./mvnw validate process-resources -am -Pantora-process-resources
+        command: mvn validate process-resources -am -Pantora-process-resources
         local: true
       scan:
         dir: target/classes/antora-resources/
diff --git a/src/main/antora/modules/ROOT/pages/dependencies.adoc b/src/main/antora/modules/ROOT/pages/dependencies.adoc
index 8cf0d2b3e8..44adcc403a 100644
--- a/src/main/antora/modules/ROOT/pages/dependencies.adoc
+++ b/src/main/antora/modules/ROOT/pages/dependencies.adoc
@@ -30,7 +30,7 @@ The version name follows `+${calver}+` for GA releases and service releases and
 
 You can find a working example of using the BOMs in our https://github.com/spring-projects/spring-data-examples/tree/main/bom[Spring Data examples repository]. With that in place, you can declare the Spring Data modules you would like to use without a version in the `<dependencies />` block, as follows:
 
-.Declaring a dependency to a Spring Data module
+.Declaring a dependency to a Spring Data module such as JPA
 [source, xml]
 ----
 <dependencies>
diff --git a/src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc b/src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc
index c800770f9e..43e7872e90 100644
--- a/src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc
+++ b/src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc
@@ -18,7 +18,7 @@ If no version property is present Spring Data falls back to inspection of the id
 
 |Implementing `Persistable`
 |If an entity implements `Persistable`, Spring Data delegates the new detection to the `isNew(…)` method of the entity.
-See the link:https://docs.spring.io/spring-data/data-commons/docs/current/api/index.html?org/springframework/data/domain/Persistable.html[Javadoc] for details.
+See the link:{spring-data-commons-javadoc-base}/index.html?org/springframework/data/domain/Persistable.html[Javadoc] for details.
 
 _Note: Properties of `Persistable` will get detected and persisted if you use `AccessType.PROPERTY`.
 To avoid that, use `@Transient`._
diff --git a/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc
index 0604695d83..ac405cac1d 100644
--- a/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc
+++ b/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc
@@ -4,7 +4,7 @@
 The central interface in the Spring Data repository abstraction is `Repository`.
 It takes the domain class to manage as well as the identifier type of the domain class as type arguments.
 This interface acts primarily as a marker interface to capture the types to work with and to help you to discover interfaces that extend this one.
-The https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/repository/CrudRepository.html[`CrudRepository`] and https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/repository/ListCrudRepository.html[`ListCrudRepository`] interfaces provide sophisticated CRUD functionality for the entity class that is being managed.
+The {spring-data-commons-javadoc-base}/org/springframework/data/repository/CrudRepository.html[`CrudRepository`] and {spring-data-commons-javadoc-base}/api/org/springframework/data/repository/ListCrudRepository.html[`ListCrudRepository`] interfaces provide sophisticated CRUD functionality for the entity class that is being managed.
 
 [[repositories.repository]]
 .`CrudRepository` Interface
@@ -40,7 +40,7 @@ The methods declared in this interface are commonly referred to as CRUD methods.
 NOTE: We also provide persistence technology-specific abstractions, such as `JpaRepository` or `MongoRepository`.
 Those interfaces extend `CrudRepository` and expose the capabilities of the underlying persistence technology in addition to the rather generic persistence technology-agnostic interfaces such as `CrudRepository`.
 
-Additional to the `CrudRepository`, there is a https://docs.spring.io/spring-data/commons/docs/current/api/org/springframework/data/repository/PagingAndSortingRepository.html[`PagingAndSortingRepository`] abstraction that adds additional methods to ease paginated access to entities:
+Additional to the `CrudRepository`, there is a {spring-data-commons-javadoc-base}/org/springframework/data/repository/PagingAndSortingRepository.html[`PagingAndSortingRepository`] abstraction that adds additional methods to ease paginated access to entities:
 
 .`PagingAndSortingRepository` interface
 [source,java]