Polishing.

Reorder antora keys.

See #1593

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java

@@ -384,8 +384,7 @@ protected Statement<?> applyStatementSettings(Statement<?> statement) {
 	 *
 	 * @param ex the offending {@link RuntimeException}
 	 * @return the DataAccessException, wrapping the {@code RuntimeException}
-	 * @see <a href=
-	 *      "https://docs.spring.io/spring/docs/current/spring-framework-reference/data-access.html#dao-exceptions">Consistent
+	 * @see <a href= "https://docs.spring.io/spring-framework/reference/data-access/dao.html#dao-exceptions">Consistent
 	 *      exception hierarchy</a>
 	 * @see DataAccessException
 	 */
@@ -410,8 +409,7 @@ protected DataAccessException translateExceptionIfPossible(RuntimeException ex)
 	 * @param ex the offending {@link RuntimeException}
 	 * @return the DataAccessException, wrapping the {@code RuntimeException}
 	 * @see org.springframework.dao.DataAccessException#getRootCause()
-	 * @see <a href=
-	 *      "https://docs.spring.io/spring/docs/current/spring-framework-reference/data-access.html#dao-exceptions">Consistent
+	 * @see <a href= "https://docs.spring.io/spring-framework/reference/data-access/dao.html#dao-exceptions">Consistent
 	 *      exception hierarchy</a>
 	 */
 	protected DataAccessException translate(String task, @Nullable String cql, RuntimeException ex) {

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java

@@ -112,8 +112,7 @@ public void afterPropertiesSet() {
 	 *
 	 * @param ex the offending {@link DriverException}
 	 * @return the DataAccessException, wrapping the {@code DriverException}
-	 * @see <a href=
-	 *      "https://docs.spring.io/spring/docs/current/spring-framework-reference/data-access.html#dao-exceptions">Consistent
+	 * @see <a href= "https://docs.spring.io/spring-framework/reference/data-access/dao.html#dao-exceptions">Consistent
 	 *      exception hierarchy</a>
 	 * @see DataAccessException
 	 */
@@ -138,8 +137,7 @@ protected DataAccessException translateExceptionIfPossible(RuntimeException ex)
 	 * @param ex the offending {@link DriverException}
 	 * @return the DataAccessException, wrapping the {@code DriverException}
 	 * @see org.springframework.dao.DataAccessException#getRootCause()
-	 * @see <a href=
-	 *      "https://docs.spring.io/spring/docs/current/spring-framework-reference/data-access.html#dao-exceptions">Consistent
+	 * @see <a href= "https://docs.spring.io/spring-framework/reference/data-access/dao.html#dao-exceptions">Consistent
 	 *      exception hierarchy</a>
 	 */
 	protected DataAccessException translate(String task, @Nullable String cql, RuntimeException ex) {

src/main/antora/modules/ROOT/pages/cassandra/configuration.adoc

@@ -6,8 +6,8 @@ You can do so either by using Java-based bean metadata or by using XML-based bea
 These are discussed in the following sections.
 
 NOTE: For those not familiar with how to configure the Spring container using Java-based bean metadata instead of XML-based metadata, see the high-level introduction in the reference docs
-https://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/new-in-3.0.html#new-java-configuration[here]
-as well as the detailed documentation {springDocsUrl}core.html#beans-java-instantiating-container[here].
+link:{springdocsurl}/core/beans/java.html[here]
+as well as the detailed documentation {springDocsUrl}/core/beans/java/instantiating-container.html[here].
 
 [[cassandra.cassandra-java-config]]
 == Registering a Session Instance by using Java-based Metadata

src/main/antora/resources/antora-resources/antora.yml

@@ -3,18 +3,19 @@ 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-commons-docs-url: https://docs.spring.io/spring-data/commons/reference/{commons}
+    spring-data-commons-javadoc-base: '{spring-data-commons-docs-url}/api/java'
     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}