Release v6.1.2

See gh-31811

.mailmap

@@ -1,36 +0,0 @@
-Juergen Hoeller <jhoeller@vmware.com>
-Juergen Hoeller <jhoeller@vmware.com> <jhoeller@pivotal.io>
-Juergen Hoeller <jhoeller@vmware.com> <jhoeller@gopivotal.com>
-Rossen Stoyanchev <rstoyanchev@vmware.com>
-Rossen Stoyanchev <rstoyanchev@vmware.com> <rstoyanchev@pivotal.io>
-Rossen Stoyanchev <rstoyanchev@vmware.com> <rstoyanchev@gopivotal.com>
-Phillip Webb <pwebb@vmware.com>
-Phillip Webb <pwebb@vmware.com> <pwebb@pivotal.io>
-Phillip Webb <pwebb@vmware.com> <pwebb@gopivotal.com>
-Chris Beams <cbeams@vmware.com>
-Chris Beams <cbeams@vmware.com> <cbeams@pivotal.io>
-Chris Beams <cbeams@vmware.com> <cbeams@gopivotal.com>
-Arjen Poutsma <poutsmaa@vmware.com>
-Arjen Poutsma <poutsmaa@vmware.com> <apoutsma@pivotal.io>
-Arjen Poutsma <poutsmaa@vmware.com> <apoutsma@gopivotal.com>
-Arjen Poutsma <poutsmaa@vmware.com> <poutsma@mac.com>
-Arjen Poutsma <poutsmaa@vmware.com> <apoutsma@vmware.com>
-Oliver Drotbohm <odrotbohm@vmware.com>
-Oliver Drotbohm <odrotbohm@vmware.com> <ogierke@vmware.com>
-Oliver Drotbohm <odrotbohm@vmware.com> <ogierke@pivotal.io>
-Oliver Drotbohm <odrotbohm@vmware.com> <ogierke@gopivotal.com>
-Dave Syer <dsyer@vmware.com>
-Dave Syer <dsyer@vmware.com> <dsyer@pivotal.io>
-Dave Syer <dsyer@vmware.com> <dsyer@gopivotal.com>
-Dave Syer <dsyer@vmware.com> <david_syer@hotmail.com>
-Andy Clement <aclement@vmware.com>
-Andy Clement <aclement@vmware.com> <aclement@pivotal.io>
-Andy Clement <aclement@vmware.com> <aclement@gopivotal.com>
-Andy Clement <aclement@vmware.com> <andrew.clement@gmail.com>
-Sam Brannen <sbrannen@vmware.com>
-Sam Brannen <sbrannen@vmware.com> <sbrannen@pivotal.io>
-Sam Brannen <sbrannen@vmware.com> <sam@sambrannen.com>
-Simon Basle <sbasle@vmware.com>
-Simon Baslé <sbasle@vmware.com>
-<dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
-Nick Williams <nicholas@nicholaswilliams.net>

README.md

@@ -1,4 +1,4 @@
-# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-6.0.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
+# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-6.1.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.1.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
 
 This is the home of the Spring Framework: the foundation for all [Spring projects](https://spring.io/projects). Collectively the Spring Framework and the family of Spring projects are often referred to simply as "Spring". 
 

build.gradle

@@ -16,6 +16,8 @@ ext {
 	javaProjects = subprojects.findAll { !it.name.startsWith("framework-") }
 }
 
+description = "Spring Framework"
+
 configure(allprojects) { project ->
 	apply plugin: "org.springframework.build.localdev"
 	group = "org.springframework"
@@ -116,8 +118,3 @@ configure([rootProject] + javaProjects) { project ->
 configure(moduleProjects) { project ->
 	apply from: "${rootDir}/gradle/spring-module.gradle"
 }
-
-configure(rootProject) {
-	description = "Spring Framework"
-	apply plugin: 'org.springframework.build.api-diff'
-}

buildSrc/README.md

@@ -22,21 +22,6 @@ but doesn't affect the classpath of dependent projects.
 This plugin does not provide a `provided` configuration, as the native `compileOnly` and `testCompileOnly`
 configurations are preferred.
 
-### API Diff
-
-This plugin uses the [Gradle JApiCmp](https://github.com/melix/japicmp-gradle-plugin) plugin
-to generate API Diff reports for each Spring Framework module. This plugin is applied once on the root
-project and creates tasks in each framework module. Unlike previous versions of this part of the build,
-there is no need for checking out a specific tag. The plugin will fetch the JARs we want to compare the
-current working version with. You can generate the reports for all modules or a single module:
-
-```
-./gradlew apiDiff -PbaselineVersion=5.1.0.RELEASE
-./gradlew :spring-core:apiDiff -PbaselineVersion=5.1.0.RELEASE
-```      
-
-The reports are located under `build/reports/api-diff/$OLDVERSION_to_$NEWVERSION/`.
-                                                                                       
 
 ### RuntimeHints Java Agent
 

buildSrc/build.gradle

@@ -21,18 +21,13 @@ dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 	implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
 	implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}"
-	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.3.0"
-	implementation "org.gradle:test-retry-gradle-plugin:1.4.1"
+	implementation "org.gradle:test-retry-gradle-plugin:1.5.6"
 	implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"
 	implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
 }
 
 gradlePlugin {
 	plugins {
-		apiDiffPlugin {
-			id = "org.springframework.build.api-diff"
-			implementationClass = "org.springframework.build.api.ApiDiffPlugin"
-		}
 		conventionsPlugin {
 			id = "org.springframework.build.conventions"
 			implementationClass = "org.springframework.build.ConventionsPlugin"

buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java

@@ -1,142 +0,0 @@
-/*
- * Copyright 2002-2023 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build.api;
-
-import java.io.File;
-import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.List;
-
-import me.champeau.gradle.japicmp.JapicmpPlugin;
-import me.champeau.gradle.japicmp.JapicmpTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.plugins.JavaBasePlugin;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
-import org.gradle.api.tasks.TaskProvider;
-import org.gradle.jvm.tasks.Jar;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * {@link Plugin} that applies the {@code "japicmp-gradle-plugin"}
- * and create tasks for all subprojects named {@code "spring-*"}, diffing the public API one by one
- * and creating the reports in {@code "build/reports/api-diff/$OLDVERSION_to_$NEWVERSION/"}.
- * <p>{@code "./gradlew apiDiff -PbaselineVersion=5.1.0.RELEASE"} will output the
- * reports for the API diff between the baseline version and the current one for all modules.
- * You can limit the report to a single module with
- * {@code "./gradlew :spring-core:apiDiff -PbaselineVersion=5.1.0.RELEASE"}.
- *
- * @author Brian Clozel
- */
-public class ApiDiffPlugin implements Plugin<Project> {
-
-	private static final Logger logger = LoggerFactory.getLogger(ApiDiffPlugin.class);
-
-	public static final String TASK_NAME = "apiDiff";
-
-	private static final String BASELINE_VERSION_PROPERTY = "baselineVersion";
-
-	private static final List<String> PACKAGE_INCLUDES = Collections.singletonList("org.springframework.*");
-
-	private static final URI SPRING_MILESTONE_REPOSITORY = URI.create("https://repo.spring.io/milestone");
-
-	@Override
-	public void apply(Project project) {
-		if (project.hasProperty(BASELINE_VERSION_PROPERTY) && project.equals(project.getRootProject())) {
-			project.getPluginManager().apply(JapicmpPlugin.class);
-			project.getPlugins().withType(JapicmpPlugin.class,
-					plugin -> applyApiDiffConventions(project));
-		}
-	}
-
-	private void applyApiDiffConventions(Project project) {
-		String baselineVersion = project.property(BASELINE_VERSION_PROPERTY).toString();
-		project.subprojects(subProject -> {
-			if (subProject.getName().startsWith("spring-")) {
-				createApiDiffTask(baselineVersion, subProject);
-			}
-		});
-	}
-
-	private void createApiDiffTask(String baselineVersion, Project project) {
-		if (isProjectEligible(project)) {
-			// Add Spring Milestone repository for generating diffs against previous milestones
-			project.getRootProject()
-					.getRepositories()
-					.maven(mavenArtifactRepository -> mavenArtifactRepository.setUrl(SPRING_MILESTONE_REPOSITORY));
-			JapicmpTask apiDiff = project.getTasks().create(TASK_NAME, JapicmpTask.class);
-			apiDiff.setDescription("Generates an API diff report with japicmp");
-			apiDiff.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP);
-
-			apiDiff.setOldClasspath(createBaselineConfiguration(baselineVersion, project));
-			TaskProvider<Jar> jar = project.getTasks().withType(Jar.class).named("jar");
-			apiDiff.setNewArchives(project.getLayout().files(jar.get().getArchiveFile().get().getAsFile()));
-			apiDiff.setNewClasspath(getRuntimeClassPath(project));
-			apiDiff.setPackageIncludes(PACKAGE_INCLUDES);
-			apiDiff.setOnlyModified(true);
-			apiDiff.setIgnoreMissingClasses(true);
-			// Ignore Kotlin metadata annotations since they contain
-			// illegal HTML characters and fail the report generation
-			apiDiff.setAnnotationExcludes(Collections.singletonList("@kotlin.Metadata"));
-
-			apiDiff.setHtmlOutputFile(getOutputFile(baselineVersion, project));
-
-			apiDiff.dependsOn(project.getTasks().getByName("jar"));
-		}
-	}
-
-	private boolean isProjectEligible(Project project) {
-		return project.getPlugins().hasPlugin(JavaPlugin.class)
-				&& project.getPlugins().hasPlugin(MavenPublishPlugin.class);
-	}
-
-	private Configuration createBaselineConfiguration(String baselineVersion, Project project) {
-		String baseline = String.join(":",
-				project.getGroup().toString(), project.getName(), baselineVersion);
-		Dependency baselineDependency = project.getDependencies().create(baseline + "@jar");
-		Configuration baselineConfiguration = project.getRootProject().getConfigurations().detachedConfiguration(baselineDependency);
-		try {
-			// eagerly resolve the baseline configuration to check whether this is a new Spring module
-			baselineConfiguration.resolve();
-			return baselineConfiguration;
-		}
-		catch (GradleException exception) {
-			logger.warn("Could not resolve {} - assuming this is a new Spring module.", baseline);
-		}
-		return project.getRootProject().getConfigurations().detachedConfiguration();
-	}
-
-	private Configuration getRuntimeClassPath(Project project) {
-		return project.getConfigurations().getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME);
-	}
-
-	private File getOutputFile(String baseLineVersion, Project project) {
-		String buildDirectoryPath = project.getRootProject()
-				.getLayout().getBuildDirectory().getAsFile().get().getAbsolutePath();
-		Path outDir = Paths.get(buildDirectoryPath, "reports", "api-diff",
-				baseLineVersion + "_to_" + project.getRootProject().getVersion());
-		return project.file(outDir.resolve(project.getName() + ".html").toString());
-	}
-
-}

ci/images/ci-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20231004
+FROM ubuntu:jammy-20231128
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh

ci/images/get-jdk-url.sh

@@ -9,7 +9,7 @@ case "$1" in
 		echo "https://download.bell-sw.com/java/21.0.1+12/bellsoft-jdk21.0.1+12-linux-amd64.tar.gz"
 	;;
 	java22)
-		echo "https://download.java.net/java/early_access/jdk22/19/GPL/openjdk-22-ea+19_linux-x64_bin.tar.gz"
+		echo "https://download.java.net/java/early_access/jdk22/27/GPL/openjdk-22-ea+27_linux-x64_bin.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"

framework-api/framework-api.gradle

@@ -27,7 +27,7 @@ javadoc {
 		author = true
 		header = rootProject.description
 		use = true
-		overview = "$rootProject.rootDir/framework-docs/src/docs/api/overview.html"
+		overview = project.relativePath("$rootProject.rootDir/framework-docs/src/docs/api/overview.html")
 		destinationDir = file("${project.buildDir}/docs/javadoc-api")
 		splitIndex = true
 		links(rootProject.ext.javadocLinks)

framework-docs/antora.yml

@@ -17,16 +17,73 @@ asciidoc:
     # FIXME: the copyright is not removed
     # FIXME: The package is not renamed
     chomp: 'all'
+    fold: 'all'
     include-java: 'example$docs-src/main/java/org/springframework/docs'
-    spring-framework-main-code: 'https://github.com/spring-projects/spring-framework/tree/main'
+    spring-site: 'https://spring.io'
+    spring-site-blog: '{spring-site}/blog'
+    spring-site-cve: "{spring-site}/security"
+    spring-site-guides: '{spring-site}/guides'
+    spring-site-projects: '{spring-site}/projects'
+    spring-site-tools: "{spring-site}/tools"
+    spring-org: 'spring-projects'
+    spring-github-org: "https://github.com/{spring-org}"
+    spring-framework-github: "https://github.com/{spring-org}/spring-framework"
+    spring-framework-code: '{spring-framework-github}/tree/main'
+    spring-framework-issues: '{spring-framework-github}/issues'
+    spring-framework-wiki: '{spring-framework-github}/wiki'
+    # Docs
     docs-site: 'https://docs.spring.io'
-    docs-spring: "{docs-site}/spring-framework/docs/{spring-version}"
-    docs-spring-framework: '{docs-site}/spring-framework/docs/{spring-version}'
-    api-spring-framework: '{docs-spring-framework}/javadoc-api/org/springframework'
-    docs-graalvm: 'https://www.graalvm.org/22.3/reference-manual'
-    docs-spring-boot: '{docs-site}/spring-boot/docs/current/reference'
+    spring-framework-docs-root: '{docs-site}/spring-framework/docs'
+    spring-framework-api: '{spring-framework-docs-root}/{spring-version}/javadoc-api/org/springframework'
+    spring-framework-api-kdoc: '{spring-framework-docs-root}/{spring-version}/kdoc-api'
+    spring-framework-reference: '{spring-framework-docs-root}/{spring-version}/reference'
+    #
+    # Other Spring portfolio projects
+    spring-boot-docs: '{docs-site}/spring-boot/docs/current/reference/html'
+    spring-boot-issues: '{spring-github-org}/spring-boot/issues'
+    # TODO add more projects / links or just build up on {docs-site}?
+    # TODO rename the below using new conventions
     docs-spring-gemfire: '{docs-site}/spring-gemfire/docs/current/reference'
     docs-spring-security: '{docs-site}/spring-security/reference'
-    gh-rsocket: 'https://github.com/rsocket'
-    gh-rsocket-extensions: '{gh-rsocket}/rsocket/blob/master/Extensions'
-    gh-rsocket-java: '{gh-rsocket}/rsocket-java{gh-rsocket}/rsocket-java'
+    docs-spring-session: '{docs-site}/spring-session/reference'
+    #
+    # External projects URLs and related attributes
+    aspectj-site: 'https://www.eclipse.org/aspectj'
+    aspectj-docs: "{aspectj-site}/doc/released"
+    aspectj-api: "{aspectj-docs}/runtime-api"
+    aspectj-docs-devguide: "{aspectj-docs}/devguide"
+    aspectj-docs-progguide: "{aspectj-docs}/progguide"
+    assertj-docs: 'https://assertj.github.io/doc'
+    baeldung-blog: 'https://www.baeldung.com'
+    bean-validation-site: 'https://beanvalidation.org'
+    graalvm-docs: 'https://www.graalvm.org/22.3/reference-manual'
+    hibernate-validator-site: 'https://hibernate.org/validator/'
+    jackson-docs: 'https://fasterxml.github.io'
+    jackson-github-org: 'https://github.com/FasterXML'
+    java-api: 'https://docs.oracle.com/en/java/javase/17/docs/api'
+    java-tutorial: 'https://docs.oracle.com/javase/tutorial'
+    JSR: 'https://www.jcp.org/en/jsr/detail?id='
+    kotlin-site: 'https://kotlinlang.org'
+    kotlin-docs: '{kotlin-site}/docs'
+    kotlin-api: '{kotlin-site}/api/latest'
+    kotlin-coroutines-api: '{kotlin-site}/api/kotlinx.coroutines'
+    kotlin-github-org: 'https://github.com/Kotlin'
+    kotlin-issues: 'https://youtrack.jetbrains.com/issue'
+    reactive-streams-site: 'https://www.reactive-streams.org'
+    reactive-streams-spec: 'https://github.com/reactive-streams/reactive-streams-jvm/blob/master/README.md#specification'
+    reactor-github-org: 'https://github.com/reactor'
+    reactor-site: 'https://projectreactor.io'
+    rsocket-github-org: 'https://github.com/rsocket'
+    rsocket-java: '{rsocket-github-org}/rsocket-java'
+    rsocket-java-code: '{rsocket-java}/tree/master/'
+    rsocket-protocol-extensions: '{rsocket-github-org}/rsocket/tree/master/Extensions'
+    rsocket-site: 'https://rsocket.io'
+    rfc-site: 'https://datatracker.ietf.org/doc/html'
+    sockjs-client: 'https://github.com/sockjs/sockjs-client'
+    sockjs-protocol: 'https://github.com/sockjs/sockjs-protocol'
+    sockjs-protocol-site: "https://sockjs.github.io/sockjs-protocol"
+    stackoverflow-site: 'https://stackoverflow.com'
+    stackoverflow-questions: '{stackoverflow-site}/questions'
+    stackoverflow-spring-tag: "{stackoverflow-questions}/tagged/spring"
+    stackoverflow-spring-kotlin-tags: "{stackoverflow-spring-tag}+kotlin"
+    testcontainers-site: 'https://www.testcontainers.org'

framework-docs/modules/ROOT/nav.adoc

@@ -421,6 +421,7 @@
 *** xref:integration/cache/specific-config.adoc[]
 ** xref:integration/observability.adoc[]
 ** xref:integration/checkpoint-restore.adoc[]
+** xref:integration/class-data-sharing.adoc[]
 ** xref:integration/appendix.adoc[]
 * xref:languages.adoc[]
 ** xref:languages/kotlin.adoc[]
@@ -438,4 +439,4 @@
 ** xref:languages/groovy.adoc[]
 ** xref:languages/dynamic.adoc[]
 * xref:appendix.adoc[]
-* https://github.com/spring-projects/spring-framework/wiki[Wiki]
+* {spring-framework-wiki}[Wiki]

framework-docs/modules/ROOT/pages/appendix.adoc

@@ -8,7 +8,7 @@ within the core Spring Framework.
 [[appendix-spring-properties]]
 == Spring Properties
 
-{api-spring-framework}/core/SpringProperties.html[`SpringProperties`] is a static holder
+{spring-framework-api}/core/SpringProperties.html[`SpringProperties`] is a static holder
 for properties that control certain low-level aspects of the Spring Framework. Users can
 configure these properties via JVM system properties or programmatically via the
 `SpringProperties.setProperty(String key, String value)` method. The latter may be
@@ -25,7 +25,7 @@ The following table lists all currently supported Spring properties.
 | `spring.beaninfo.ignore`
 | Instructs Spring to use the `Introspector.IGNORE_ALL_BEANINFO` mode when calling the
 JavaBeans `Introspector`. See
-{api-spring-framework}++/beans/StandardBeanInfoFactory.html#IGNORE_BEANINFO_PROPERTY_NAME++[`CachedIntrospectionResults`]
+{spring-framework-api}++/beans/StandardBeanInfoFactory.html#IGNORE_BEANINFO_PROPERTY_NAME++[`CachedIntrospectionResults`]
 for details.
 
 | `spring.expression.compiler.mode`
@@ -36,7 +36,7 @@ xref:core/expressions/evaluation.adoc#expressions-compiler-configuration[Spring
 | Instructs Spring to ignore operating system environment variables if a Spring
 `Environment` property -- for example, a placeholder in a configuration String -- isn't
 resolvable otherwise. See
-{api-spring-framework}++/core/env/AbstractEnvironment.html#IGNORE_GETENV_PROPERTY_NAME++[`AbstractEnvironment`]
+{spring-framework-api}++/core/env/AbstractEnvironment.html#IGNORE_GETENV_PROPERTY_NAME++[`AbstractEnvironment`]
 for details.
 
 | `spring.jdbc.getParameterType.ignore`
@@ -47,12 +47,12 @@ See the note in xref:data-access/jdbc/advanced.adoc#jdbc-batch-list[Batch Operat
 | Instructs Spring to ignore a default JNDI environment, as an optimization for scenarios
 where nothing is ever to be found for such JNDI fallback searches to begin with, avoiding
 the repeated JNDI lookup overhead. See
-{api-spring-framework}++/jndi/JndiLocatorDelegate.html#IGNORE_JNDI_PROPERTY_NAME++[`JndiLocatorDelegate`]
+{spring-framework-api}++/jndi/JndiLocatorDelegate.html#IGNORE_JNDI_PROPERTY_NAME++[`JndiLocatorDelegate`]
 for details.
 
 | `spring.objenesis.ignore`
 | Instructs Spring to ignore Objenesis, not even attempting to use it. See
-{api-spring-framework}++/objenesis/SpringObjenesis.html#IGNORE_OBJENESIS_PROPERTY_NAME++[`SpringObjenesis`]
+{spring-framework-api}++/objenesis/SpringObjenesis.html#IGNORE_OBJENESIS_PROPERTY_NAME++[`SpringObjenesis`]
 for details.
 
 | `spring.test.aot.processing.failOnError`

framework-docs/modules/ROOT/pages/attributes.adoc

@@ -1,20 +0,0 @@
-// Spring Portfolio
-:docs-site:                     https://docs.spring.io
-:docs-spring-boot:              {docs-site}/spring-boot/docs/current/reference
-:docs-spring-gemfire:           {docs-site}/spring-gemfire/docs/current/reference
-:docs-spring-security:          {docs-site}/spring-security/reference
-// spring-asciidoctor-backends Settings
-:chomp:                         default headers packages
-:fold:                          all
-// Spring Framework
-:docs-spring-framework:         {docs-site}/spring-framework/docs/{spring-version}
-:api-spring-framework:          {docs-spring-framework}/javadoc-api/org/springframework
-:docs-java:                     {docdir}/../../main/java/org/springframework/docs
-:docs-kotlin:                   {docdir}/../../main/kotlin/org/springframework/docs
-:docs-resources:                {docdir}/../../main/resources
-:spring-framework-main-code:    https://github.com/spring-projects/spring-framework/tree/main
-// Third-party Links
-:docs-graalvm:                  https://www.graalvm.org/22.3/reference-manual
-:gh-rsocket:                    https://github.com/rsocket
-:gh-rsocket-extensions:         {gh-rsocket}/rsocket/blob/master/Extensions
-:gh-rsocket-java:               {gh-rsocket}/rsocket-java

framework-docs/modules/ROOT/pages/core/aop-api/extensibility.adoc

@@ -12,5 +12,5 @@ support for new custom advice types be added without changing the core framework
 The only constraint on a custom `Advice` type is that it must implement the
 `org.aopalliance.aop.Advice` marker interface.
 
-See the {api-spring-framework}/aop/framework/adapter/package-summary.html[`org.springframework.aop.framework.adapter`]
+See the {spring-framework-api}/aop/framework/adapter/package-summary.html[`org.springframework.aop.framework.adapter`]
 javadoc for further information.

framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc

@@ -119,7 +119,7 @@ The following listing shows an example configuration:
 
 Note that the target object (`businessObjectTarget` in the preceding example) must be a
 prototype. This lets the `PoolingTargetSource` implementation create new instances
-of the target to grow the pool as necessary. See the {api-spring-framework}/aop/target/AbstractPoolingTargetSource.html[javadoc of
+of the target to grow the pool as necessary. See the {spring-framework-api}/aop/target/AbstractPoolingTargetSource.html[javadoc of
 `AbstractPoolingTargetSource`] and the concrete subclass you wish to use for information
 about its properties. `maxSize` is the most basic and is always guaranteed to be present.
 

framework-docs/modules/ROOT/pages/core/aop/aspectj-programmatic.adoc

@@ -52,7 +52,7 @@ Kotlin::
 ----
 ======
 
-See the {api-spring-framework}/aop/aspectj/annotation/AspectJProxyFactory.html[javadoc] for more information.
+See the {spring-framework-api}/aop/aspectj/annotation/AspectJProxyFactory.html[javadoc] for more information.
 
 
 

framework-docs/modules/ROOT/pages/core/aop/ataspectj.adoc

@@ -4,7 +4,7 @@
 
 @AspectJ refers to a style of declaring aspects as regular Java classes annotated with
 annotations. The @AspectJ style was introduced by the
-https://www.eclipse.org/aspectj[AspectJ project] as part of the AspectJ 5 release. Spring
+{aspectj-site}[AspectJ project] as part of the AspectJ 5 release. Spring
 interprets the same annotations as AspectJ 5, using a library supplied by AspectJ
 for pointcut parsing and matching. The AOP runtime is still pure Spring AOP, though, and
 there is no dependency on the AspectJ compiler or weaver.

framework-docs/modules/ROOT/pages/core/aop/ataspectj/advice.adoc

@@ -482,7 +482,7 @@ The `JoinPoint` interface provides a number of useful methods:
 * `getSignature()`: Returns a description of the method that is being advised.
 * `toString()`: Prints a useful description of the method being advised.
 
-See the https://www.eclipse.org/aspectj/doc/released/runtime-api/org/aspectj/lang/JoinPoint.html[javadoc] for more detail.
+See the {aspectj-api}/org/aspectj/lang/JoinPoint.html[javadoc] for more detail.
 
 [[aop-ataspectj-advice-params-passing]]
 === Passing Parameters to Advice
@@ -730,7 +730,7 @@ of determining parameter names, an exception will be thrown.
   flag for `javac`. Recommended approach on Java 8+.
 `AspectJAdviceParameterNameDiscoverer` :: Deduces parameter names from the pointcut
   expression, `returning`, and `throwing` clauses. See the
-  {api-spring-framework}/aop/aspectj/AspectJAdviceParameterNameDiscoverer.html[javadoc]
+  {spring-framework-api}/aop/aspectj/AspectJAdviceParameterNameDiscoverer.html[javadoc]
   for details on the algorithm used.
 
 [[aop-ataspectj-advice-params-names-explicit]]

framework-docs/modules/ROOT/pages/core/aop/ataspectj/pointcuts.adoc

@@ -36,9 +36,9 @@ Kotlin::
 
 The pointcut expression that forms the value of the `@Pointcut` annotation is a regular
 AspectJ pointcut expression. For a full discussion of AspectJ's pointcut language, see
-the https://www.eclipse.org/aspectj/doc/released/progguide/index.html[AspectJ
+the {aspectj-docs-progguide}/index.html[AspectJ
 Programming Guide] (and, for extensions, the
-https://www.eclipse.org/aspectj/doc/released/adk15notebook/index.html[AspectJ 5
+{aspectj-docs}/adk15notebook/index.html[AspectJ 5
 Developer's Notebook]) or one of the books on AspectJ (such as _Eclipse AspectJ_, by Colyer
 et al., or _AspectJ in Action_, by Ramnivas Laddad).
 
@@ -392,7 +392,7 @@ method that takes no parameters, whereas `(..)` matches any number (zero or more
 The `({asterisk})` pattern matches a method that takes one parameter of any type.
 `(*,String)` matches a method that takes two parameters. The first can be of any type, while the
 second must be a `String`. Consult the
-https://www.eclipse.org/aspectj/doc/released/progguide/semantics-pointcuts.html[Language
+{aspectj-docs-progguide}/semantics-pointcuts.html[Language
 Semantics] section of the AspectJ Programming Guide for more information.
 
 The following examples show some common pointcut expressions:

framework-docs/modules/ROOT/pages/core/aop/resources.adoc

@@ -2,7 +2,7 @@
 = Further Resources
 :page-section-summary-toc: 1
 
-More information on AspectJ can be found on the https://www.eclipse.org/aspectj[AspectJ website].
+More information on AspectJ can be found on the {aspectj-site}[AspectJ website].
 
 _Eclipse AspectJ_ by Adrian Colyer et. al. (Addison-Wesley, 2005) provides a
 comprehensive introduction and reference for the AspectJ language.

framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc

@@ -136,7 +136,7 @@ using Spring in accordance with the properties of the annotation". In this conte
 "initialization" refers to newly instantiated objects (for example, objects instantiated
 with the `new` operator) as well as to `Serializable` objects that are undergoing
 deserialization (for example, through
-https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html[readResolve()]).
+{java-api}/java.base/java/io/Serializable.html[readResolve()]).
 
 [NOTE]
 =====
@@ -168,14 +168,13 @@ Kotlin::
 
 You can find more information about the language semantics of the various pointcut
 types in AspectJ
-https://www.eclipse.org/aspectj/doc/next/progguide/semantics-joinPoints.html[in this
-appendix] of the https://www.eclipse.org/aspectj/doc/next/progguide/index.html[AspectJ
-Programming Guide].
+{aspectj-docs-progguide}/semantics-joinPoints.html[in this appendix] of the
+{aspectj-docs-progguide}/index.html[AspectJ Programming Guide].
 =====
 
 For this to work, the annotated types must be woven with the AspectJ weaver. You can
 either use a build-time Ant or Maven task to do this (see, for example, the
-https://www.eclipse.org/aspectj/doc/released/devguide/antTasks.html[AspectJ Development
+{aspectj-docs-devguide}/antTasks.html[AspectJ Development
 Environment Guide]) or load-time weaving (see xref:core/aop/using-aspectj.adoc#aop-aj-ltw[Load-time Weaving with AspectJ in the Spring Framework]). The
 `AnnotationBeanConfigurerAspect` itself needs to be configured by Spring (in order to obtain
 a reference to the bean factory that is to be used to configure new objects). If you
@@ -399,7 +398,7 @@ The focus of this section is on configuring and using LTW in the specific contex
 Spring Framework. This section is not a general introduction to LTW. For full details on
 the specifics of LTW and configuring LTW with only AspectJ (with Spring not being
 involved at all), see the
-https://www.eclipse.org/aspectj/doc/released/devguide/ltw.html[LTW section of the AspectJ
+{aspectj-docs-devguide}/ltw.html[LTW section of the AspectJ
 Development Environment Guide].
 
 The value that the Spring Framework brings to AspectJ LTW is in enabling much
@@ -421,7 +420,7 @@ who typically are in charge of the deployment configuration, such as the launch
 Now that the sales pitch is over, let us first walk through a quick example of AspectJ
 LTW that uses Spring, followed by detailed specifics about elements introduced in the
 example. For a complete example, see the
-https://github.com/spring-projects/spring-petclinic[Petclinic sample application].
+{spring-github-org}/spring-petclinic[Petclinic sample application].
 
 
 [[aop-aj-ltw-first-example]]
@@ -621,7 +620,7 @@ java -javaagent:C:/projects/xyz/lib/spring-instrument.jar com.xyz.Main
 ----
 
 The `-javaagent` is a flag for specifying and enabling
-https://docs.oracle.com/javase/8/docs/api/java/lang/instrument/package-summary.html[agents
+{java-api}/java.instrument/java/lang/instrument/package-summary.html[agents
 to instrument programs that run on the JVM]. The Spring Framework ships with such an
 agent, the `InstrumentationSavingAgent`, which is packaged in the
 `spring-instrument.jar` that was supplied as the value of the `-javaagent` argument in
@@ -721,7 +720,7 @@ The AspectJ LTW infrastructure is configured by using one or more `META-INF/aop.
 files that are on the Java classpath (either directly or, more typically, in jar files).
 
 The structure and contents of this file is detailed in the LTW part of the
-https://www.eclipse.org/aspectj/doc/released/devguide/ltw-configuration.html[AspectJ reference
+{aspectj-docs-devguide}/ltw-configuration.html[AspectJ reference
 documentation]. Because the `aop.xml` file is 100% AspectJ, we do not describe it further here.
 
 

framework-docs/modules/ROOT/pages/core/aot.adoc

@@ -17,7 +17,7 @@ Applying such optimizations early implies the following restrictions:
 * The beans defined in your application cannot change at runtime, meaning:
 ** `@Profile`, in particular profile-specific configuration needs to be chosen at build time.
 ** `Environment` properties that impact the presence of a bean (`@Conditional`) are only considered at build time.
-* Bean definitions with instance suppliers (lambdas or method references) cannot be transformed ahead-of-time (see related https://github.com/spring-projects/spring-framework/issues/29555[spring-framework#29555] issue).
+* Bean definitions with instance suppliers (lambdas or method references) cannot be transformed ahead-of-time (see related {spring-framework-issues}/29555[spring-framework#29555] issue).
 * Make sure that the bean type is as precise as possible.
 
 TIP: See also the xref:core/aot.adoc#aot.bestpractices[] section.
@@ -27,7 +27,7 @@ A Spring AOT processed application typically generates:
 
 * Java source code
 * Bytecode (usually for dynamic proxies)
-* {api-spring-framework}/aot/hint/RuntimeHints.html[`RuntimeHints`] for the use of reflection, resource loading, serialization, and JDK proxies.
+* {spring-framework-api}/aot/hint/RuntimeHints.html[`RuntimeHints`] for the use of reflection, resource loading, serialization, and JDK proxies.
 
 NOTE: At the moment, AOT is focused on allowing Spring applications to be deployed as native images using GraalVM.
 We intend to support more JVM-based use cases in future generations.
@@ -35,7 +35,7 @@ We intend to support more JVM-based use cases in future generations.
 [[aot.basics]]
 == AOT engine overview
 
-The entry point of the AOT engine for processing an `ApplicationContext` arrangement is `ApplicationContextAotGenerator`. It takes care of the following steps, based on a `GenericApplicationContext` that represents the application to optimize and a {api-spring-framework}/aot/generate/GenerationContext.html[`GenerationContext`]:
+The entry point of the AOT engine for processing an `ApplicationContext` arrangement is `ApplicationContextAotGenerator`. It takes care of the following steps, based on a `GenericApplicationContext` that represents the application to optimize and a {spring-framework-api}/aot/generate/GenerationContext.html[`GenerationContext`]:
 
 * Refresh an `ApplicationContext` for AOT processing. Contrary to a traditional refresh, this version only creates bean definitions, not bean instances.
 * Invoke the available `BeanFactoryInitializationAotProcessor` implementations and apply their contributions against the `GenerationContext`.
@@ -81,7 +81,7 @@ Once this part completes, the `BeanFactory` contains the bean definitions that a
 [[aot.bean-factory-initialization-contributions]]
 == Bean Factory Initialization AOT Contributions
 
-Components that want to participate in this step can implement the {api-spring-framework}/beans/factory/aot/BeanFactoryInitializationAotProcessor.html[`BeanFactoryInitializationAotProcessor`] interface.
+Components that want to participate in this step can implement the {spring-framework-api}/beans/factory/aot/BeanFactoryInitializationAotProcessor.html[`BeanFactoryInitializationAotProcessor`] interface.
 Each implementation can return an AOT contribution, based on the state of the bean factory.
 
 An AOT contribution is a component that contributes generated code that reproduces a particular behavior.
@@ -156,6 +156,7 @@ Java::
 	/**
 	 * Bean definitions for {@link DataSourceConfiguration}
 	 */
+	@Generated
 	public class DataSourceConfiguration__BeanDefinitions {
 		/**
 		 * Get the bean definition for 'dataSourceConfiguration'
@@ -190,6 +191,9 @@ Java::
 
 NOTE: The exact code generated may differ depending on the exact nature of your bean definitions.
 
+TIP: Each generated class is annotated with `org.springframework.aot.generate.Generated` to
+identify them if they need to be excluded, for instance by static analysis tools.
+
 The generated code above creates bean definitions equivalent to the `@Configuration` class, but in a direct way and without the use of reflection if at all possible.
 There is a bean definition for `dataSourceConfiguration` and one for `dataSourceBean`.
 When a `datasource` instance is required, a `BeanInstanceSupplier` is called.
@@ -261,7 +265,7 @@ If you are registering bean definitions programmatically, consider using `RootBe
 The container is able to choose the most appropriate constructor to use based on several candidates.
 However, this is not a best practice and flagging the preferred constructor with `@Autowired` if necessary is preferred.
 
-In case you are working on a code base that you can't modify, you can set the {api-spring-framework}/beans/factory/support/AbstractBeanDefinition.html#PREFERRED_CONSTRUCTORS_ATTRIBUTE[`preferredConstructors` attribute] on the related bean definition to indicate which constructor should be used.
+In case you are working on a code base that you can't modify, you can set the {spring-framework-api}/beans/factory/support/AbstractBeanDefinition.html#PREFERRED_CONSTRUCTORS_ATTRIBUTE[`preferredConstructors` attribute] on the related bean definition to indicate which constructor should be used.
 
 [[aot.bestpractices.factory-bean]]
 === FactoryBean
@@ -379,7 +383,7 @@ For instance, GraalVM needs to know ahead of time if a component uses reflection
 Similarly, classpath resources are not shipped in a native image unless specified explicitly.
 Consequently, if the application needs to load a resource, it must be referenced from the corresponding GraalVM native image configuration file.
 
-The {api-spring-framework}/aot/hint/RuntimeHints.html[`RuntimeHints`] API collects the need for reflection, resource loading, serialization, and JDK proxies at runtime.
+The {spring-framework-api}/aot/hint/RuntimeHints.html[`RuntimeHints`] API collects the need for reflection, resource loading, serialization, and JDK proxies at runtime.
 The following example makes sure that `config/app.properties` can be loaded from the classpath at runtime within a native image:
 
 [tabs]
@@ -417,7 +421,7 @@ It is also possible to register an implementation statically by adding an entry
 [[aot.hints.reflective]]
 === `@Reflective`
 
-{api-spring-framework}/aot/hint/annotation/Reflective.html[`@Reflective`] provides an idiomatic way to flag the need for reflection on an annotated element.
+{spring-framework-api}/aot/hint/annotation/Reflective.html[`@Reflective`] provides an idiomatic way to flag the need for reflection on an annotated element.
 For instance, `@EventListener` is meta-annotated with `@Reflective` since the underlying implementation invokes the annotated method using reflection.
 
 By default, only Spring beans are considered and an invocation hint is registered for the annotated element.
@@ -431,7 +435,7 @@ If components other than Spring beans need to be processed, a `BeanFactoryInitia
 [[aot.hints.register-reflection-for-binding]]
 === `@RegisterReflectionForBinding`
 
-{api-spring-framework}/aot/hint/annotation/RegisterReflectionForBinding.html[`@RegisterReflectionForBinding`] is a specialization of `@Reflective` that registers the need for serializing arbitrary types.
+{spring-framework-api}/aot/hint/annotation/RegisterReflectionForBinding.html[`@RegisterReflectionForBinding`] is a specialization of `@Reflective` that registers the need for serializing arbitrary types.
 A typical use case is the use of DTOs that the container cannot infer, such as using a web client within a method body.
 
 `@RegisterReflectionForBinding` can be applied to any Spring bean at the class level, but it can also be applied directly to a method, field, or constructor to better indicate where the hints are actually required.
@@ -467,7 +471,7 @@ include-code::./SpellCheckServiceTests[tag=hintspredicates]
 With `RuntimeHintsPredicates`, we can check for reflection, resource, serialization, or proxy generation hints.
 This approach works well for unit tests but implies that the runtime behavior of a component is well known.
 
-You can learn more about the global runtime behavior of an application by running its test suite (or the app itself) with the {docs-graalvm}/native-image/metadata/AutomaticMetadataCollection/[GraalVM tracing agent].
+You can learn more about the global runtime behavior of an application by running its test suite (or the app itself) with the {graalvm-docs}/native-image/metadata/AutomaticMetadataCollection/[GraalVM tracing agent].
 This agent will record all relevant calls requiring GraalVM hints at runtime and write them out as JSON configuration files.
 
 For more targeted discovery and testing, Spring Framework ships a dedicated module with core AOT testing utilities, `"org.springframework:spring-core-test"`.
@@ -499,4 +503,4 @@ io.spring.runtimehintstesting.SampleReflectionRuntimeHintsTests#lambda$shouldReg
 
 There are various ways to configure this Java agent in your build, so please refer to the documentation of your build tool and test execution plugin.
 The agent itself can be configured to instrument specific packages (by default, only `org.springframework` is instrumented).
-You'll find more details in the {spring-framework-main-code}/buildSrc/README.md[Spring Framework `buildSrc` README] file.
+You'll find more details in the {spring-framework-code}/buildSrc/README.md[Spring Framework `buildSrc` README] file.

framework-docs/modules/ROOT/pages/core/appendix/xml-custom.adoc

@@ -765,7 +765,7 @@ want to add an additional attribute to the existing bean definition element.
 
 By way of another example, suppose that you define a bean definition for a
 service object that (unknown to it) accesses a clustered
-https://jcp.org/en/jsr/detail?id=107[JCache], and you want to ensure that the
+{JSR}107[JCache], and you want to ensure that the
 named JCache instance is eagerly started within the surrounding cluster.
 The following listing shows such a definition:
 

framework-docs/modules/ROOT/pages/core/appendix/xsd-schemas.adoc

@@ -66,13 +66,13 @@ developer's intent ("`inject this constant value`"), and it reads better:
 [[xsd-schemas-util-frfb]]
 ==== Setting a Bean Property or Constructor Argument from a Field Value
 
-{api-spring-framework}/beans/factory/config/FieldRetrievingFactoryBean.html[`FieldRetrievingFactoryBean`]
+{spring-framework-api}/beans/factory/config/FieldRetrievingFactoryBean.html[`FieldRetrievingFactoryBean`]
 is a `FactoryBean` that retrieves a `static` or non-static field value. It is typically
 used for retrieving `public` `static` `final` constants, which may then be used to set a
 property value or constructor argument for another bean.
 
 The following example shows how a `static` field is exposed, by using the
-{api-spring-framework}/beans/factory/config/FieldRetrievingFactoryBean.html#setStaticField(java.lang.String)[`staticField`]
+{spring-framework-api}/beans/factory/config/FieldRetrievingFactoryBean.html#setStaticField(java.lang.String)[`staticField`]
 property:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -109,7 +109,7 @@ to be specified for the bean reference, as the following example shows:
 
 You can also access a non-static (instance) field of another bean, as
 described in the API documentation for the
-{api-spring-framework}/beans/factory/config/FieldRetrievingFactoryBean.html[`FieldRetrievingFactoryBean`]
+{spring-framework-api}/beans/factory/config/FieldRetrievingFactoryBean.html[`FieldRetrievingFactoryBean`]
 class.
 
 Injecting enumeration values into beans as either property or constructor arguments is

framework-docs/modules/ROOT/pages/core/beans/annotation-config.adoc

@@ -17,7 +17,7 @@ No matter the choice, Spring can accommodate both styles and even mix them toget
 It is worth pointing out that through its xref:core/beans/java.adoc[JavaConfig] option, Spring lets
 annotations be used in a non-invasive way, without touching the target components'
 source code and that, in terms of tooling, all configuration styles are supported by
-https://spring.io/tools[Spring Tools] for Eclipse, Visual Studio Code, and Theia.
+{spring-site-tools}[Spring Tools] for Eclipse, Visual Studio Code, and Theia.
 ****
 
 An alternative to XML setup is provided by annotation-based configuration, which relies
@@ -62,11 +62,11 @@ configuration (notice the inclusion of the `context` namespace):
 
 The `<context:annotation-config/>` element implicitly registers the following post-processors:
 
-* {api-spring-framework}/context/annotation/ConfigurationClassPostProcessor.html[`ConfigurationClassPostProcessor`]
-* {api-spring-framework}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`]
-* {api-spring-framework}/context/annotation/CommonAnnotationBeanPostProcessor.html[`CommonAnnotationBeanPostProcessor`]
-* {api-spring-framework}/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html[`PersistenceAnnotationBeanPostProcessor`]
-* {api-spring-framework}/context/event/EventListenerMethodProcessor.html[`EventListenerMethodProcessor`]
+* {spring-framework-api}/context/annotation/ConfigurationClassPostProcessor.html[`ConfigurationClassPostProcessor`]
+* {spring-framework-api}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`]
+* {spring-framework-api}/context/annotation/CommonAnnotationBeanPostProcessor.html[`CommonAnnotationBeanPostProcessor`]
+* {spring-framework-api}/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.html[`PersistenceAnnotationBeanPostProcessor`]
+* {spring-framework-api}/context/event/EventListenerMethodProcessor.html[`EventListenerMethodProcessor`]
 
 [NOTE]
 ====

framework-docs/modules/ROOT/pages/core/beans/annotation-config/custom-autowire-configurer.adoc

@@ -1,7 +1,7 @@
 [[beans-custom-autowire-configurer]]
 = Using `CustomAutowireConfigurer`
 
-{api-spring-framework}/beans/factory/annotation/CustomAutowireConfigurer.html[`CustomAutowireConfigurer`]
+{spring-framework-api}/beans/factory/annotation/CustomAutowireConfigurer.html[`CustomAutowireConfigurer`]
 is a `BeanFactoryPostProcessor` that lets you register your own custom qualifier
 annotation types, even if they are not annotated with Spring's `@Qualifier` annotation.
 The following example shows how to use `CustomAutowireConfigurer`:

framework-docs/modules/ROOT/pages/core/beans/annotation-config/resource.adoc

@@ -84,7 +84,7 @@ Kotlin::
 NOTE: The name provided with the annotation is resolved as a bean name by the
 `ApplicationContext` of which the `CommonAnnotationBeanPostProcessor` is aware.
 The names can be resolved through JNDI if you configure Spring's
-{api-spring-framework}/jndi/support/SimpleJndiBeanFactory.html[`SimpleJndiBeanFactory`]
+{spring-framework-api}/jndi/support/SimpleJndiBeanFactory.html[`SimpleJndiBeanFactory`]
 explicitly. However, we recommend that you rely on the default behavior and
 use Spring's JNDI lookup capabilities to preserve the level of indirection.
 

framework-docs/modules/ROOT/pages/core/beans/basics.adoc

@@ -12,8 +12,8 @@ between those objects.
 Several implementations of the `ApplicationContext` interface are supplied
 with Spring. In stand-alone applications, it is common to create an
 instance of
-{api-spring-framework}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
-or {api-spring-framework}/context/support/FileSystemXmlApplicationContext.html[`FileSystemXmlApplicationContext`].
+{spring-framework-api}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
+or {spring-framework-api}/context/support/FileSystemXmlApplicationContext.html[`FileSystemXmlApplicationContext`].
 While XML has been the traditional format for defining configuration metadata, you can
 instruct the container to use Java annotations or code as the metadata format by
 providing a small amount of XML configuration to declaratively enable support for these
@@ -24,7 +24,7 @@ more instances of a Spring IoC container. For example, in a web application scen
 simple eight (or so) lines of boilerplate web descriptor XML in the `web.xml` file
 of the application typically suffices (see
 xref:core/beans/context-introduction.adoc#context-create[Convenient ApplicationContext Instantiation for Web Applications]).
-If you use the https://spring.io/tools[Spring Tools for Eclipse] (an Eclipse-powered
+If you use the {spring-site-tools}[Spring Tools for Eclipse] (an Eclipse-powered
 development environment), you can easily create this boilerplate configuration with a
 few mouse clicks or keystrokes.
 
@@ -61,10 +61,10 @@ For information about using other forms of metadata with the Spring container, s
   annotation-based configuration metadata.
 * xref:core/beans/java.adoc[Java-based configuration]: define beans external to your application
   classes by using Java rather than XML files. To use these features, see the
-  {api-spring-framework}/context/annotation/Configuration.html[`@Configuration`],
-  {api-spring-framework}/context/annotation/Bean.html[`@Bean`],
-  {api-spring-framework}/context/annotation/Import.html[`@Import`],
-  and {api-spring-framework}/context/annotation/DependsOn.html[`@DependsOn`] annotations.
+  {spring-framework-api}/context/annotation/Configuration.html[`@Configuration`],
+  {spring-framework-api}/context/annotation/Bean.html[`@Bean`],
+  {spring-framework-api}/context/annotation/Import.html[`@Import`],
+  and {spring-framework-api}/context/annotation/DependsOn.html[`@DependsOn`] annotations.
 
 Spring configuration consists of at least one and typically more than one bean
 definition that the container must manage. XML-based configuration metadata configures these

framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc

@@ -191,7 +191,7 @@ Kotlin::
 ======
 
 For further details, see the
-https://github.com/spring-projects/spring-framework/wiki/Spring-Annotation-Programming-Model[Spring Annotation Programming Model]
+{spring-framework-wiki}/Spring-Annotation-Programming-Model[Spring Annotation Programming Model]
 wiki page.
 
 
@@ -315,7 +315,7 @@ entries in the classpath. When you build JARs with Ant, make sure that you do no
 activate the files-only switch of the JAR task. Also, classpath directories may not be
 exposed based on security policies in some environments -- for example, standalone apps on
 JDK 1.7.0_45 and higher (which requires 'Trusted-Library' setup in your manifests -- see
-https://stackoverflow.com/questions/19394570/java-jre-7u45-breaks-classloader-getresources).
+{stackoverflow-questions}/19394570/java-jre-7u45-breaks-classloader-getresources).
 
 On JDK 9's module path (Jigsaw), Spring's classpath scanning generally works as expected.
 However, make sure that your component classes are exported in your `module-info`
@@ -743,7 +743,7 @@ Kotlin::
 
 If you do not want to rely on the default bean-naming strategy, you can provide a custom
 bean-naming strategy. First, implement the
-{api-spring-framework}/beans/factory/support/BeanNameGenerator.html[`BeanNameGenerator`]
+{spring-framework-api}/beans/factory/support/BeanNameGenerator.html[`BeanNameGenerator`]
 interface, and be sure to include a default no-arg constructor. Then, provide the fully
 qualified class name when configuring the scanner, as the following example annotation
 and bean definition show.
@@ -840,7 +840,7 @@ possibly also declaring a custom scoped-proxy mode.
 
 NOTE: To provide a custom strategy for scope resolution rather than relying on the
 annotation-based approach, you can implement the
-{api-spring-framework}/context/annotation/ScopeMetadataResolver.html[`ScopeMetadataResolver`]
+{spring-framework-api}/context/annotation/ScopeMetadataResolver.html[`ScopeMetadataResolver`]
 interface. Be sure to include a default no-arg constructor. Then you can provide the
 fully qualified class name when configuring the scanner, as the following example of both
 an annotation and a bean definition shows:

framework-docs/modules/ROOT/pages/core/beans/context-introduction.adoc

@@ -4,7 +4,7 @@
 As discussed in the xref:web/webmvc-view/mvc-xslt.adoc#mvc-view-xslt-beandefs[chapter introduction], the `org.springframework.beans.factory`
 package provides basic functionality for managing and manipulating beans, including in a
 programmatic way. The `org.springframework.context` package adds the
-{api-spring-framework}/context/ApplicationContext.html[`ApplicationContext`]
+{spring-framework-api}/context/ApplicationContext.html[`ApplicationContext`]
 interface, which extends the `BeanFactory` interface, in addition to extending other
 interfaces to provide additional functionality in a more application
 framework-oriented style. Many people use the `ApplicationContext` in a completely
@@ -269,7 +269,7 @@ file format but is more flexible than the standard JDK based
 `ResourceBundleMessageSource` implementation. In particular, it allows for reading
 files from any Spring resource location (not only from the classpath) and supports hot
 reloading of bundle property files (while efficiently caching them in between).
-See the {api-spring-framework}/context/support/ReloadableResourceBundleMessageSource.html[`ReloadableResourceBundleMessageSource`]
+See the {spring-framework-api}/context/support/ReloadableResourceBundleMessageSource.html[`ReloadableResourceBundleMessageSource`]
 javadoc for details.
 
 
@@ -485,8 +485,8 @@ This means that the `publishEvent()` method blocks until all listeners have fini
 One advantage of this synchronous and single-threaded approach is that, when a listener receives an event,
 it operates inside the transaction context of the publisher if a transaction context is available.
 If another strategy for event publication becomes necessary, e.g. asynchronous event processing by default,
-see the javadoc for Spring's {api-spring-framework}/context/event/ApplicationEventMulticaster.html[`ApplicationEventMulticaster`] interface
-and {api-spring-framework}/context/event/SimpleApplicationEventMulticaster.html[`SimpleApplicationEventMulticaster`] implementation
+see the javadoc for Spring's {spring-framework-api}/context/event/ApplicationEventMulticaster.html[`ApplicationEventMulticaster`] interface
+and {spring-framework-api}/context/event/SimpleApplicationEventMulticaster.html[`SimpleApplicationEventMulticaster`] implementation
 for configuration options which can be applied to a custom "applicationEventMulticaster" bean definition.
 In these cases, ThreadLocals and logging context are not propagated for the event processing.
 See xref:integration/observability.adoc#observability.application-events[the `@EventListener` Observability section]
@@ -529,7 +529,7 @@ notify appropriate parties.
 NOTE: Spring's eventing mechanism is designed for simple communication between Spring beans
 within the same application context. However, for more sophisticated enterprise
 integration needs, the separately maintained
-https://projects.spring.io/spring-integration/[Spring Integration] project provides
+{spring-site-projects}/spring-integration/[Spring Integration] project provides
 complete support for building lightweight,
 https://www.enterpriseintegrationpatterns.com[pattern-oriented], event-driven
 architectures that build upon the well-known Spring programming model.
@@ -742,11 +742,11 @@ Be aware of the following limitations when using asynchronous events:
 
 * If an asynchronous event listener throws an `Exception`, it is not propagated to the
   caller. See
-  {api-spring-framework}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`AsyncUncaughtExceptionHandler`]
+  {spring-framework-api}/aop/interceptor/AsyncUncaughtExceptionHandler.html[`AsyncUncaughtExceptionHandler`]
   for more details.
 * Asynchronous event listener methods cannot publish a subsequent event by returning a
   value. If you need to publish another event as the result of the processing, inject an
-  {api-spring-framework}/context/ApplicationEventPublisher.html[`ApplicationEventPublisher`]
+  {spring-framework-api}/context/ApplicationEventPublisher.html[`ApplicationEventPublisher`]
   to publish the event manually.
 * ThreadLocals and logging context are not propagated by default for the event processing.
   See xref:integration/observability.adoc#observability.application-events[the `@EventListener` Observability section]
@@ -1040,7 +1040,7 @@ and JMX support facilities. Application components can also interact with the ap
 server's JCA `WorkManager` through Spring's `TaskExecutor` abstraction.
 
 See the javadoc of the
-{api-spring-framework}/jca/context/SpringContextResourceAdapter.html[`SpringContextResourceAdapter`]
+{spring-framework-api}/jca/context/SpringContextResourceAdapter.html[`SpringContextResourceAdapter`]
 class for the configuration details involved in RAR deployment.
 
 For a simple deployment of a Spring ApplicationContext as a Jakarta EE RAR file:
@@ -1050,7 +1050,7 @@ all application classes into a RAR file (which is a standard JAR file with a dif
 file extension).
 . Add all required library JARs into the root of the RAR archive.
 . Add a
-`META-INF/ra.xml` deployment descriptor (as shown in the {api-spring-framework}/jca/context/SpringContextResourceAdapter.html[javadoc for `SpringContextResourceAdapter`])
+`META-INF/ra.xml` deployment descriptor (as shown in the {spring-framework-api}/jca/context/SpringContextResourceAdapter.html[javadoc for `SpringContextResourceAdapter`])
 and the corresponding Spring XML bean definition file(s) (typically
 `META-INF/applicationContext.xml`).
 . Drop the resulting RAR file into your

framework-docs/modules/ROOT/pages/core/beans/context-load-time-weaver.adoc

@@ -44,7 +44,7 @@ weaver instance. This is particularly useful in combination with
 xref:data-access/orm/jpa.adoc[Spring's JPA support] where load-time weaving may be
 necessary for JPA class transformation.
 Consult the
-{api-spring-framework}/orm/jpa/LocalContainerEntityManagerFactoryBean.html[`LocalContainerEntityManagerFactoryBean`]
+{spring-framework-api}/orm/jpa/LocalContainerEntityManagerFactoryBean.html[`LocalContainerEntityManagerFactoryBean`]
 javadoc for more detail. For more on AspectJ load-time weaving, see xref:core/aop/using-aspectj.adoc#aop-aj-ltw[Load-time Weaving with AspectJ in the Spring Framework].
 
 

framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-method-injection.adoc

@@ -99,7 +99,7 @@ container, lets you handle this use case cleanly.
 
 ****
 You can read more about the motivation for Method Injection in
-https://spring.io/blog/2004/08/06/method-injection/[this blog entry].
+{spring-site-blog}/2004/08/06/method-injection/[this blog entry].
 ****
 
 

framework-docs/modules/ROOT/pages/core/beans/dependencies/factory-properties-detailed.adoc

@@ -51,7 +51,7 @@ XML configuration:
 
 The preceding XML is more succinct. However, typos are discovered at runtime rather than
 design time, unless you use an IDE (such as https://www.jetbrains.com/idea/[IntelliJ
-IDEA] or the https://spring.io/tools[Spring Tools for Eclipse])
+IDEA] or the {spring-site-tools}[Spring Tools for Eclipse])
 that supports automatic property completion when you create bean definitions. Such IDE
 assistance is highly recommended.
 

framework-docs/modules/ROOT/pages/core/beans/environment.adoc

@@ -1,7 +1,7 @@
 [[beans-environment]]
 = Environment Abstraction
 
-The {api-spring-framework}/core/env/Environment.html[`Environment`] interface
+The {spring-framework-api}/core/env/Environment.html[`Environment`] interface
 is an abstraction integrated in the container that models two key
 aspects of the application environment: xref:core/beans/environment.adoc#beans-definition-profiles[profiles]
 and xref:core/beans/environment.adoc#beans-property-source-abstraction[properties].
@@ -118,7 +118,7 @@ situation B. We start by updating our configuration to reflect this need.
 [[beans-definition-profiles-java]]
 === Using `@Profile`
 
-The {api-spring-framework}/context/annotation/Profile.html[`@Profile`]
+The {spring-framework-api}/context/annotation/Profile.html[`@Profile`]
 annotation lets you indicate that a component is eligible for registration
 when one or more specified profiles are active. Using our preceding example, we
 can rewrite the `dataSource` configuration as follows:
@@ -516,8 +516,8 @@ as the following example shows:
 [[beans-definition-profiles-default]]
 === Default Profile
 
-The default profile represents the profile that is enabled by default. Consider the
-following example:
+The default profile represents the profile that is enabled if no profile is active. Consider
+the following example:
 
 [tabs]
 ======
@@ -558,9 +558,9 @@ Kotlin::
 ----
 ======
 
-If no profile is active, the `dataSource` is created. You can see this
-as a way to provide a default definition for one or more beans. If any
-profile is enabled, the default profile does not apply.
+If xref:#beans-definition-profiles-enable[no profile is active], the `dataSource` is
+created. You can see this as a way to provide a default definition for one or more
+beans. If any profile is enabled, the default profile does not apply.
 
 The name of the default profile is `default`. You can change the name of
 the default profile by using `setDefaultProfiles()` on the `Environment` or,
@@ -599,17 +599,17 @@ Kotlin::
 
 In the preceding snippet, we see a high-level way of asking Spring whether the `my-property` property is
 defined for the current environment. To answer this question, the `Environment` object performs
-a search over a set of {api-spring-framework}/core/env/PropertySource.html[`PropertySource`]
+a search over a set of {spring-framework-api}/core/env/PropertySource.html[`PropertySource`]
 objects. A `PropertySource` is a simple abstraction over any source of key-value pairs, and
-Spring's {api-spring-framework}/core/env/StandardEnvironment.html[`StandardEnvironment`]
+Spring's {spring-framework-api}/core/env/StandardEnvironment.html[`StandardEnvironment`]
 is configured with two PropertySource objects -- one representing the set of JVM system properties
 (`System.getProperties()`) and one representing the set of system environment variables
 (`System.getenv()`).
 
 NOTE: These default property sources are present for `StandardEnvironment`, for use in standalone
-applications. {api-spring-framework}/web/context/support/StandardServletEnvironment.html[`StandardServletEnvironment`]
+applications. {spring-framework-api}/web/context/support/StandardServletEnvironment.html[`StandardServletEnvironment`]
 is populated with additional default property sources including servlet config, servlet
-context parameters, and a {api-spring-framework}/jndi/JndiPropertySource.html[`JndiPropertySource`]
+context parameters, and a {spring-framework-api}/jndi/JndiPropertySource.html[`JndiPropertySource`]
 if JNDI is available.
 
 Concretely, when you use the `StandardEnvironment`, the call to `env.containsProperty("my-property")`
@@ -663,7 +663,7 @@ Kotlin::
 In the preceding code, `MyPropertySource` has been added with highest precedence in the
 search. If it contains a  `my-property` property, the property is detected and returned, in favor of
 any `my-property` property in any other `PropertySource`. The
-{api-spring-framework}/core/env/MutablePropertySources.html[`MutablePropertySources`]
+{spring-framework-api}/core/env/MutablePropertySources.html[`MutablePropertySources`]
 API exposes a number of methods that allow for precise manipulation of the set of
 property sources.
 
@@ -672,7 +672,7 @@ property sources.
 [[beans-using-propertysource]]
 == Using `@PropertySource`
 
-The {api-spring-framework}/context/annotation/PropertySource.html[`@PropertySource`]
+The {spring-framework-api}/context/annotation/PropertySource.html[`@PropertySource`]
 annotation provides a convenient and declarative mechanism for adding a `PropertySource`
 to Spring's `Environment`.
 

framework-docs/modules/ROOT/pages/core/beans/factory-extension.adoc

@@ -22,8 +22,8 @@ in which these `BeanPostProcessor` instances run by setting the `order` property
 You can set this property only if the `BeanPostProcessor` implements the `Ordered`
 interface. If you write your own `BeanPostProcessor`, you should consider implementing
 the `Ordered` interface, too. For further details, see the javadoc of the
-{api-spring-framework}/beans/factory/config/BeanPostProcessor.html[`BeanPostProcessor`]
-and {api-spring-framework}/core/Ordered.html[`Ordered`] interfaces. See also the note on
+{spring-framework-api}/beans/factory/config/BeanPostProcessor.html[`BeanPostProcessor`]
+and {spring-framework-api}/core/Ordered.html[`Ordered`] interfaces. See also the note on
 xref:core/beans/factory-extension.adoc#beans-factory-programmatically-registering-beanpostprocessors[programmatic registration of `BeanPostProcessor` instances].
 
 [NOTE]
@@ -272,8 +272,8 @@ which these `BeanFactoryPostProcessor` instances run by setting the `order` prop
 However, you can only set this property if the `BeanFactoryPostProcessor` implements the
 `Ordered` interface. If you write your own `BeanFactoryPostProcessor`, you should
 consider implementing the `Ordered` interface, too. See the javadoc of the
-{api-spring-framework}/beans/factory/config/BeanFactoryPostProcessor.html[`BeanFactoryPostProcessor`]
-and {api-spring-framework}/core/Ordered.html[`Ordered`] interfaces for more details.
+{spring-framework-api}/beans/factory/config/BeanFactoryPostProcessor.html[`BeanFactoryPostProcessor`]
+and {spring-framework-api}/core/Ordered.html[`Ordered`] interfaces for more details.
 
 [NOTE]
 ====

framework-docs/modules/ROOT/pages/core/beans/factory-scopes.adoc

@@ -51,7 +51,7 @@ The following table describes the supported scopes:
 
 NOTE: A thread scope is available but is not registered by default. For more information,
 see the documentation for
-{api-spring-framework}/context/support/SimpleThreadScope.html[`SimpleThreadScope`].
+{spring-framework-api}/context/support/SimpleThreadScope.html[`SimpleThreadScope`].
 For instructions on how to register this or any other custom scope, see
 xref:core/beans/factory-scopes.adoc#beans-factory-scopes-custom-using[Using a Custom Scope].
 
@@ -559,7 +559,7 @@ To integrate your custom scopes into the Spring container, you need to implement
 `org.springframework.beans.factory.config.Scope` interface, which is described in this
 section. For an idea of how to implement your own scopes, see the `Scope`
 implementations that are supplied with the Spring Framework itself and the
-{api-spring-framework}/beans/factory/config/Scope.html[`Scope`] javadoc,
+{spring-framework-api}/beans/factory/config/Scope.html[`Scope`] javadoc,
 which explains the methods you need to implement in more detail.
 
 The `Scope` interface has four methods to get objects from the scope, remove them from
@@ -629,7 +629,7 @@ Kotlin::
 ----
 ======
 
-See the {api-spring-framework}/beans/factory/config/Scope.html#registerDestructionCallback[javadoc]
+See the {spring-framework-api}/beans/factory/config/Scope.html#registerDestructionCallback[javadoc]
 or a Spring scope implementation for more information on destruction callbacks.
 
 The following method obtains the conversation identifier for the underlying scope:

framework-docs/modules/ROOT/pages/core/beans/introduction.adoc

@@ -1,22 +1,22 @@
 [[beans-introduction]]
 = Introduction to the Spring IoC Container and Beans
 
-This chapter covers the Spring Framework implementation of the Inversion of Control
-(IoC) principle. IoC is also known as dependency injection (DI). It is a process whereby
-objects define their dependencies (that is, the other objects they work with) only through
-constructor arguments, arguments to a factory method, or properties that are set on the
-object instance after it is constructed or returned from a factory method. The container
+This chapter covers the Spring Framework implementation of the Inversion of Control (IoC)
+principle. Dependency injection (DI) is a specialized form of IoC, whereby objects define
+their dependencies (that is, the other objects they work with) only through constructor
+arguments, arguments to a factory method, or properties that are set on the object
+instance after it is constructed or returned from a factory method. The IoC container
 then injects those dependencies when it creates the bean. This process is fundamentally
-the inverse (hence the name, Inversion of Control) of the bean itself
-controlling the instantiation or location of its dependencies by using direct
-construction of classes or a mechanism such as the Service Locator pattern.
+the inverse (hence the name, Inversion of Control) of the bean itself controlling the
+instantiation or location of its dependencies by using direct construction of classes or
+a mechanism such as the Service Locator pattern.
 
 The `org.springframework.beans` and `org.springframework.context` packages are the basis
 for Spring Framework's IoC container. The
-{api-spring-framework}/beans/factory/BeanFactory.html[`BeanFactory`]
+{spring-framework-api}/beans/factory/BeanFactory.html[`BeanFactory`]
 interface provides an advanced configuration mechanism capable of managing any type of
 object.
-{api-spring-framework}/context/ApplicationContext.html[`ApplicationContext`]
+{spring-framework-api}/context/ApplicationContext.html[`ApplicationContext`]
 is a sub-interface of `BeanFactory`. It adds:
 
 * Easier integration with Spring's AOP features

framework-docs/modules/ROOT/pages/core/beans/java.adoc

@@ -3,17 +3,5 @@
 :page-section-summary-toc: 1
 
 This section covers how to use annotations in your Java code to configure the Spring
-container. It includes the following topics:
-
-* xref:core/beans/java/basic-concepts.adoc[Basic Concepts: `@Bean` and `@Configuration`]
-* xref:core/beans/java/instantiating-container.adoc[Instantiating the Spring Container by Using `AnnotationConfigApplicationContext`]
-* xref:core/beans/java/bean-annotation.adoc[Using the `@Bean` Annotation]
-* xref:core/beans/java/configuration-annotation.adoc[Using the `@Configuration` annotation]
-* xref:core/beans/java/composing-configuration-classes.adoc[Composing Java-based Configurations]
-* xref:core/beans/environment.adoc#beans-definition-profiles[Bean Definition Profiles]
-* xref:core/beans/environment.adoc#beans-property-source-abstraction[`PropertySource` Abstraction]
-* xref:core/beans/environment.adoc#beans-using-propertysource[Using `@PropertySource`]
-* xref:core/beans/environment.adoc#beans-placeholder-resolution-in-statements[Placeholder Resolution in Statements]
-
-
+container.
 

framework-docs/modules/ROOT/pages/core/beans/java/bean-annotation.adoc

@@ -552,7 +552,7 @@ Sometimes, it is helpful to provide a more detailed textual description of a bea
 be particularly useful when beans are exposed (perhaps through JMX) for monitoring purposes.
 
 To add a description to a `@Bean`, you can use the
-{api-spring-framework}/context/annotation/Description.html[`@Description`]
+{spring-framework-api}/context/annotation/Description.html[`@Description`]
 annotation, as the following example shows:
 
 [tabs]

framework-docs/modules/ROOT/pages/core/beans/java/composing-configuration-classes.adoc

@@ -225,7 +225,7 @@ Also, be particularly careful with `BeanPostProcessor` and `BeanFactoryPostProce
 through `@Bean`. Those should usually be declared as `static @Bean` methods, not triggering the
 instantiation of their containing configuration class. Otherwise, `@Autowired` and `@Value` may not
 work on the configuration class itself, since it is possible to create it as a bean instance earlier than
-{api-spring-framework}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`].
+{spring-framework-api}/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.html[`AutowiredAnnotationBeanPostProcessor`].
 ====
 
 The following example shows how one bean can be autowired to another bean:
@@ -338,7 +338,7 @@ modularity, but determining exactly where the autowired bean definitions are dec
 still somewhat ambiguous. For example, as a developer looking at `ServiceConfig`, how do
 you know exactly where the `@Autowired AccountRepository` bean is declared? It is not
 explicit in the code, and this may be just fine. Remember that the
-https://spring.io/tools[Spring Tools for Eclipse] provides tooling that
+{spring-site-tools}[Spring Tools for Eclipse] provides tooling that
 can render graphs showing how everything is wired, which may be all you need. Also,
 your Java IDE can easily find all declarations and uses of the `AccountRepository` type
 and quickly show you the location of `@Bean` methods that return that type.
@@ -519,7 +519,7 @@ profile has been enabled in the Spring `Environment` (see xref:core/beans/enviro
 for details).
 
 The `@Profile` annotation is actually implemented by using a much more flexible annotation
-called {api-spring-framework}/context/annotation/Conditional.html[`@Conditional`].
+called {spring-framework-api}/context/annotation/Conditional.html[`@Conditional`].
 The `@Conditional` annotation indicates specific
 `org.springframework.context.annotation.Condition` implementations that should be
 consulted before a `@Bean` is registered.
@@ -570,7 +570,7 @@ Kotlin::
 ----
 ======
 
-See the {api-spring-framework}/context/annotation/Conditional.html[`@Conditional`]
+See the {spring-framework-api}/context/annotation/Conditional.html[`@Conditional`]
 javadoc for more detail.
 
 

framework-docs/modules/ROOT/pages/core/beans/java/instantiating-container.adoc

@@ -278,7 +278,7 @@ init-param):
 
 NOTE: For programmatic use cases, a `GenericWebApplicationContext` can be used as an
 alternative to `AnnotationConfigWebApplicationContext`. See the
-{api-spring-framework}/web/context/support/GenericWebApplicationContext.html[`GenericWebApplicationContext`]
+{spring-framework-api}/web/context/support/GenericWebApplicationContext.html[`GenericWebApplicationContext`]
 javadoc for details.
 
 

framework-docs/modules/ROOT/pages/core/databuffer-codec.adoc

@@ -56,7 +56,7 @@ alternate between read and write.
 == `PooledDataBuffer`
 
 As explained in the Javadoc for
-https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html[ByteBuffer],
+{java-api}/java.base/java/nio/ByteBuffer.html[ByteBuffer],
 byte buffers can be direct or non-direct. Direct buffers may reside outside the Java heap
 which eliminates the need for copying for native I/O operations. That makes direct buffers
 particularly useful for receiving and sending data over a socket, but they're also more

framework-docs/modules/ROOT/pages/core/expressions.adoc

@@ -11,7 +11,7 @@ EL, to name a few -- the Spring Expression Language was created to provide the S
 community with a single well supported expression language that can be used across all
 the products in the Spring portfolio. Its language features are driven by the
 requirements of the projects in the Spring portfolio, including tooling requirements
-for code completion support within the https://spring.io/tools[Spring Tools for Eclipse].
+for code completion support within the {spring-site-tools}[Spring Tools for Eclipse].
 That said, SpEL is based on a technology-agnostic API that lets other expression language
 implementations be integrated, should the need arise.
 

framework-docs/modules/ROOT/pages/core/expressions/language-ref.adoc

@@ -2,24 +2,4 @@
 = Language Reference
 :page-section-summary-toc: 1
 
-This section describes how the Spring Expression Language works. It covers the following
-topics:
-
-* xref:core/expressions/language-ref/literal.adoc[Literal Expressions]
-* xref:core/expressions/language-ref/properties-arrays.adoc[Properties, Arrays, Lists, Maps, and Indexers]
-* xref:core/expressions/language-ref/inline-lists.adoc[Inline Lists]
-* xref:core/expressions/language-ref/inline-maps.adoc[Inline Maps]
-* xref:core/expressions/language-ref/array-construction.adoc[Array Construction]
-* xref:core/expressions/language-ref/methods.adoc[Methods]
-* xref:core/expressions/language-ref/operators.adoc[Operators]
-* xref:core/expressions/language-ref/types.adoc[Types]
-* xref:core/expressions/language-ref/constructors.adoc[Constructors]
-* xref:core/expressions/language-ref/variables.adoc[Variables]
-* xref:core/expressions/language-ref/functions.adoc[User-Defined Functions]
-* xref:core/expressions/language-ref/bean-references.adoc[Bean References]
-* xref:core/expressions/language-ref/operator-ternary.adoc[Ternary Operator (If-Then-Else)]
-* xref:core/expressions/language-ref/operator-elvis.adoc[The Elvis Operator]
-* xref:core/expressions/language-ref/operator-safe-navigation.adoc[Safe Navigation Operator]
-
-
-
+This section describes how the Spring Expression Language works.

framework-docs/modules/ROOT/pages/core/expressions/language-ref/variables.adoc

@@ -1,8 +1,8 @@
 [[expressions-ref-variables]]
 = Variables
 
-You can reference variables in the expression by using the `#variableName` syntax. Variables
-are set by using the `setVariable` method on `EvaluationContext` implementations.
+You can reference variables in an expression by using the `#variableName` syntax. Variables
+are set by using the `setVariable()` method in `EvaluationContext` implementations.
 
 [NOTE]
 ====
@@ -29,7 +29,7 @@ Java::
 	context.setVariable("newName", "Mike Tesla");
 
 	parser.parseExpression("name = #newName").getValue(context, tesla);
-	System.out.println(tesla.getName())  // "Mike Tesla"
+	System.out.println(tesla.getName());  // "Mike Tesla"
 ----
 
 Kotlin::
@@ -53,8 +53,10 @@ Kotlin::
 The `#this` variable is always defined and refers to the current evaluation object
 (against which unqualified references are resolved). The `#root` variable is always
 defined and refers to the root context object. Although `#this` may vary as components of
-an expression are evaluated, `#root` always refers to the root. The following examples
-show how to use the `#this` and `#root` variables:
+an expression are evaluated, `#root` always refers to the root.
+
+The following example shows how to use the `#this` variable in conjunction with
+xref:core/expressions/language-ref/collection-selection.adoc[collection selection].
 
 [tabs]
 ======
@@ -62,40 +64,95 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
-	// create an array of integers
-	List<Integer> primes = new ArrayList<>();
-	primes.addAll(Arrays.asList(2,3,5,7,11,13,17));
+	// Create a list of prime integers.
+	List<Integer> primes = List.of(2, 3, 5, 7, 11, 13, 17);
 
-	// create parser and set variable 'primes' as the array of integers
+	// Create parser and set variable 'primes' as the list of integers.
 	ExpressionParser parser = new SpelExpressionParser();
-	EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataAccess();
+	EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
 	context.setVariable("primes", primes);
 
-	// all prime numbers > 10 from the list (using selection ?{...})
-	// evaluates to [11, 13, 17]
-	List<Integer> primesGreaterThanTen = (List<Integer>) parser.parseExpression(
-			"#primes.?[#this>10]").getValue(context);
+	// Select all prime numbers > 10 from the list (using selection ?{...}).
+	String expression = "#primes.?[#this > 10]";
+
+	// Evaluates to a list containing [11, 13, 17].
+	List<Integer> primesGreaterThanTen =
+			parser.parseExpression(expression).getValue(context, List.class);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	// create an array of integers
-	val primes = ArrayList<Int>()
-	primes.addAll(listOf(2, 3, 5, 7, 11, 13, 17))
+	// Create a list of prime integers.
+	val primes = listOf(2, 3, 5, 7, 11, 13, 17)
 
-	// create parser and set variable 'primes' as the array of integers
+	// Create parser and set variable 'primes' as the list of integers.
 	val parser = SpelExpressionParser()
-	val context = SimpleEvaluationContext.forReadOnlyDataAccess()
+	val context = SimpleEvaluationContext.forReadWriteDataBinding().build()
 	context.setVariable("primes", primes)
 
-	// all prime numbers > 10 from the list (using selection ?{...})
-	// evaluates to [11, 13, 17]
-	val primesGreaterThanTen = parser.parseExpression(
-			"#primes.?[#this>10]").getValue(context) as List<Int>
+	// Select all prime numbers > 10 from the list (using selection ?{...}).
+	val expression = "#primes.?[#this > 10]"
+
+	// Evaluates to a list containing [11, 13, 17].
+	val primesGreaterThanTen = parser.parseExpression(expression)
+			.getValue(context) as List<Int>
 ----
 ======
 
+The following example shows how to use the `#this` and `#root` variables together in
+conjunction with
+xref:core/expressions/language-ref/collection-projection.adoc[collection projection].
 
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	// Create parser and evaluation context.
+	ExpressionParser parser = new SpelExpressionParser();
+	EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
+
+	// Create an inventor to use as the root context object.
+	Inventor tesla = new Inventor("Nikola Tesla");
+	tesla.setInventions("Telephone repeater", "Tesla coil transformer");
+
+	// Iterate over all inventions of the Inventor referenced as the #root
+	// object, and generate a list of strings whose contents take the form
+	// "<inventor's name> invented the <invention>." (using projection !{...}).
+	String expression = "#root.inventions.![#root.name + ' invented the ' + #this + '.']";
+
+	// Evaluates to a list containing:
+	// "Nikola Tesla invented the Telephone repeater."
+	// "Nikola Tesla invented the Tesla coil transformer."
+	List<String> results = parser.parseExpression(expression)
+			.getValue(context, tesla, List.class);
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	// Create parser and evaluation context.
+	val parser = SpelExpressionParser()
+	val context = SimpleEvaluationContext.forReadWriteDataBinding().build()
+
+	// Create an inventor to use as the root context object.
+	val tesla = Inventor("Nikola Tesla")
+	tesla.setInventions("Telephone repeater", "Tesla coil transformer")
+
+	// Iterate over all inventions of the Inventor referenced as the #root
+	// object, and generate a list of strings whose contents take the form
+	// "<inventor's name> invented the <invention>." (using projection !{...}).
+	val expression = "#root.inventions.![#root.name + ' invented the ' + #this + '.']"
+
+	// Evaluates to a list containing:
+	// "Nikola Tesla invented the Telephone repeater."
+	// "Nikola Tesla invented the Tesla coil transformer."
+	val results = parser.parseExpression(expression)
+			.getValue(context, tesla, List::class.java)
+----
+======
 

framework-docs/modules/ROOT/pages/core/null-safety.adoc

@@ -5,14 +5,14 @@ Although Java does not let you express null-safety with its type system, the Spr
 provides the following annotations in the `org.springframework.lang` package to let you
 declare nullability of APIs and fields:
 
-* {api-spring-framework}/lang/Nullable.html[`@Nullable`]: Annotation to indicate that a
+* {spring-framework-api}/lang/Nullable.html[`@Nullable`]: Annotation to indicate that a
 specific parameter, return value, or field can be `null`.
-* {api-spring-framework}/lang/NonNull.html[`@NonNull`]: Annotation to indicate that a specific
+* {spring-framework-api}/lang/NonNull.html[`@NonNull`]: Annotation to indicate that a specific
 parameter, return value, or field cannot be `null` (not needed on parameters, return values,
 and fields where `@NonNullApi` and `@NonNullFields` apply, respectively).
-* {api-spring-framework}/lang/NonNullApi.html[`@NonNullApi`]: Annotation at the package level
+* {spring-framework-api}/lang/NonNullApi.html[`@NonNullApi`]: Annotation at the package level
 that declares non-null as the default semantics for parameters and return values.
-* {api-spring-framework}/lang/NonNullFields.html[`@NonNullFields`]: Annotation at the package
+* {spring-framework-api}/lang/NonNullFields.html[`@NonNullFields`]: Annotation at the package
 level that declares non-null as the default semantics for fields.
 
 The Spring Framework itself leverages these annotations, but they can also be used in any
@@ -37,7 +37,7 @@ these annotations can be used by an IDE (such as IDEA or Eclipse) to provide use
 warnings related to null-safety in order to avoid `NullPointerException` at runtime.
 
 They are also used to make Spring APIs null-safe in Kotlin projects, since Kotlin natively
-supports https://kotlinlang.org/docs/null-safety.html[null-safety]. More details
+supports {kotlin-docs}/null-safety.html[null-safety]. More details
 are available in the xref:languages/kotlin/null-safety.adoc[Kotlin support documentation].
 
 
@@ -46,7 +46,7 @@ are available in the xref:languages/kotlin/null-safety.adoc[Kotlin support docum
 [[jsr-305-meta-annotations]]
 == JSR-305 meta-annotations
 
-Spring annotations are meta-annotated with https://jcp.org/en/jsr/detail?id=305[JSR 305]
+Spring annotations are meta-annotated with {JSR}305[JSR 305]
 annotations (a dormant but widespread JSR). JSR-305 meta-annotations let tooling vendors
 like IDEA or Kotlin provide null-safety support in a generic way, without having to
 hard-code support for Spring annotations.

framework-docs/modules/ROOT/pages/core/resources.adoc

@@ -37,7 +37,7 @@ such as a method to check for the existence of the resource being pointed to.
 Spring's `Resource` interface located in the `org.springframework.core.io.` package is
 meant to be a more capable interface for abstracting access to low-level resources. The
 following listing provides an overview of the `Resource` interface. See the
-{api-spring-framework}/core/io/Resource.html[`Resource`] javadoc for further details.
+{spring-framework-api}/core/io/Resource.html[`Resource`] javadoc for further details.
 
 
 [source,java,indent=0,subs="verbatim,quotes"]
@@ -104,7 +104,7 @@ resource (if the underlying implementation is compatible and supports that
 functionality).
 
 Some implementations of the `Resource` interface also implement the extended
-{api-spring-framework}/core/io/WritableResource.html[`WritableResource`] interface
+{spring-framework-api}/core/io/WritableResource.html[`WritableResource`] interface
 for a resource that supports writing to it.
 
 Spring itself uses the `Resource` abstraction extensively, as an argument type in
@@ -143,7 +143,7 @@ Spring includes several built-in `Resource` implementations:
 
 For a complete list of `Resource` implementations available in Spring, consult the
 "All Known Implementing Classes" section of the
-{api-spring-framework}/core/io/Resource.html[`Resource`] javadoc.
+{spring-framework-api}/core/io/Resource.html[`Resource`] javadoc.
 
 
 
@@ -763,7 +763,7 @@ Kotlin::
 ----
 ======
 
-See the {api-spring-framework}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
+See the {spring-framework-api}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
 javadoc for details on the various constructors.
 
 
@@ -903,7 +903,7 @@ entries in the classpath. When you build JARs with Ant, do not activate the `fil
 switch of the JAR task. Also, classpath directories may not get exposed based on security
 policies in some environments -- for example, stand-alone applications on JDK 1.7.0_45
 and higher (which requires 'Trusted-Library' to be set up in your manifests. See
-https://stackoverflow.com/questions/19394570/java-jre-7u45-breaks-classloader-getresources).
+{stackoverflow-questions}/19394570/java-jre-7u45-breaks-classloader-getresources).
 
 On JDK 9's module path (Jigsaw), Spring's classpath scanning generally works as expected.
 Putting resources into a dedicated directory is highly recommendable here as well,

framework-docs/modules/ROOT/pages/core/spring-jcl.adoc

@@ -9,7 +9,7 @@ known as _JUL_ or `java.util.logging`) if neither Log4j 2.x nor SLF4J is availab
 
 Put Log4j 2.x or Logback (or another SLF4J provider) in your classpath, without any extra
 bridges, and let the framework auto-adapt to your choice. For further information see the
-https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-logging[Spring
+{spring-boot-docs}/features.html#features.logging[Spring
 Boot Logging Reference Documentation].
 
 [NOTE]

framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc

@@ -51,7 +51,7 @@ A JavaBean is a class with a default no-argument constructor and that follows
 a naming convention where (for example) a property named `bingoMadness` would
 have a setter method `setBingoMadness(..)` and a getter method `getBingoMadness()`. For
 more information about JavaBeans and the specification, see
-https://docs.oracle.com/javase/8/docs/api/java/beans/package-summary.html[javabeans].
+{java-api}/java.desktop/java/beans/package-summary.html[javabeans].
 
 One quite important class in the beans package is the `BeanWrapper` interface and its
 corresponding implementation (`BeanWrapperImpl`). As quoted from the javadoc, the
@@ -249,7 +249,7 @@ behavior can be achieved by registering custom editors of type
 `java.beans.PropertyEditor`. Registering custom editors on a `BeanWrapper` or,
 alternatively, in a specific IoC container (as mentioned in the previous chapter), gives it
 the knowledge of how to convert properties to the desired type. For more about
-`PropertyEditor`, see https://docs.oracle.com/javase/8/docs/api/java/beans/package-summary.html[the javadoc of the `java.beans` package from Oracle].
+`PropertyEditor`, see {java-api}/java.desktop/java/beans/package-summary.html[the javadoc of the `java.beans` package from Oracle].
 
 A couple of examples where property editing is used in Spring:
 
@@ -355,7 +355,7 @@ com
 
 Note that you can also use the standard `BeanInfo` JavaBeans mechanism here as well
 (described to some extent
-https://docs.oracle.com/javase/tutorial/javabeans/advanced/customization.html[here]). The
+{java-tutorial}/javabeans/advanced/customization.html[here]). The
 following example uses the `BeanInfo` mechanism to explicitly register one or more
 `PropertyEditor` instances with the properties of an associated class:
 

framework-docs/modules/ROOT/pages/core/validation/beanvalidation.adoc

@@ -2,7 +2,7 @@
 = Java Bean Validation
 
 The Spring Framework provides support for the
-https://beanvalidation.org/[Java Bean Validation] API.
+{bean-validation-site}[Java Bean Validation] API.
 
 
 
@@ -72,7 +72,7 @@ Kotlin::
 ======
 
 A Bean Validation validator then validates instances of this class based on the declared
-constraints. See https://beanvalidation.org/[Bean Validation] for general information about
+constraints. See {bean-validation-site}[Bean Validation] for general information about
 the API. See the https://hibernate.org/validator/[Hibernate Validator] documentation for
 specific constraints. To learn how to set up a bean validation provider as a Spring
 bean, keep reading.
@@ -317,7 +317,7 @@ XML::
 To be eligible for Spring-driven method validation, target classes need to be annotated
 with Spring's `@Validated` annotation, which can optionally also declare the validation
 groups to use. See
-{api-spring-framework}/validation/beanvalidation/MethodValidationPostProcessor.html[`MethodValidationPostProcessor`]
+{spring-framework-api}/validation/beanvalidation/MethodValidationPostProcessor.html[`MethodValidationPostProcessor`]
 for setup details with the Hibernate Validator and Bean Validation providers.
 
 [TIP]
@@ -472,7 +472,7 @@ Max.degrees=You cannot provide more than {1} {0}
 The default `LocalValidatorFactoryBean` configuration suffices for most
 cases. There are a number of configuration options for various Bean Validation
 constructs, from message interpolation to traversal resolution. See the
-{api-spring-framework}/validation/beanvalidation/LocalValidatorFactoryBean.html[`LocalValidatorFactoryBean`]
+{spring-framework-api}/validation/beanvalidation/LocalValidatorFactoryBean.html[`LocalValidatorFactoryBean`]
 javadoc for more information on these options.
 
 

framework-docs/modules/ROOT/pages/core/validation/conversion.adoc

@@ -19,8 +19,8 @@ of the field). This is done as a convenience to aid developers when targeting er
 
 More information on the `MessageCodesResolver` and the default strategy can be found
 in the javadoc of
-{api-spring-framework}/validation/MessageCodesResolver.html[`MessageCodesResolver`] and
-{api-spring-framework}/validation/DefaultMessageCodesResolver.html[`DefaultMessageCodesResolver`],
+{spring-framework-api}/validation/MessageCodesResolver.html[`MessageCodesResolver`] and
+{spring-framework-api}/validation/DefaultMessageCodesResolver.html[`DefaultMessageCodesResolver`],
 respectively.
 
 

framework-docs/modules/ROOT/pages/core/validation/format.adoc

@@ -139,7 +139,7 @@ Kotlin::
 ======
 
 The Spring team welcomes community-driven `Formatter` contributions. See
-https://github.com/spring-projects/spring-framework/issues[GitHub Issues] to contribute.
+{spring-framework-issues}[GitHub Issues] to contribute.
 
 
 

framework-docs/modules/ROOT/pages/core/validation/validator.adoc

@@ -96,7 +96,7 @@ Kotlin::
 
 The `static` `rejectIfEmpty(..)` method on the `ValidationUtils` class is used to
 reject the `name` property if it is `null` or the empty string. Have a look at the
-{api-spring-framework}/validation/ValidationUtils.html[`ValidationUtils`] javadoc
+{spring-framework-api}/validation/ValidationUtils.html[`ValidationUtils`] javadoc
 to see what functionality it provides besides the example shown previously.
 
 While it is certainly possible to implement a single `Validator` class to validate each
@@ -193,7 +193,7 @@ Kotlin::
 Validation errors are reported to the `Errors` object passed to the validator. In the case
 of Spring Web MVC, you can use the `<spring:bind/>` tag to inspect the error messages, but
 you can also inspect the `Errors` object yourself. More information about the
-methods it offers can be found in the {api-spring-framework}/validation/Errors.html[javadoc].
+methods it offers can be found in the {spring-framework-api}/validation/Errors.html[javadoc].
 
 Validators may also get locally invoked for the immediate validation of a given object,
 not involving a binding process. As of 6.1, this has been simplified through a new

framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc

@@ -199,7 +199,7 @@ participating in Spring managed transactions. It is generally preferable to writ
 own new code by using the higher level abstractions for resource management, such as
 `JdbcTemplate` or `DataSourceUtils`.
 
-See the {api-spring-framework}/jdbc/datasource/TransactionAwareDataSourceProxy.html[`TransactionAwareDataSourceProxy`]
+See the {spring-framework-api}/jdbc/datasource/TransactionAwareDataSourceProxy.html[`TransactionAwareDataSourceProxy`]
 javadoc for more details.
 
 
@@ -230,6 +230,19 @@ provided you stick to the required connection lookup pattern. Note that JTA does
 savepoints or custom isolation levels and has a different timeout mechanism but otherwise
 exposes similar behavior in terms of JDBC resources and JDBC commit/rollback management.
 
+For JTA-style lazy retrieval of actual resource connections, Spring provides a
+corresponding `DataSource` proxy class for the target connection pool: see
+{spring-framework-api}/jdbc/datasource/LazyConnectionDataSourceProxy.html[`LazyConnectionDataSourceProxy`].
+This is particularly useful for potentially empty transactions without actual statement
+execution (never fetching an actual resource in such a scenario), and also in front of
+a routing `DataSource` which means to take the transaction-synchronized read-only flag
+and/or isolation level into account (e.g. `IsolationLevelDataSourceRouter`).
+
+`LazyConnectionDataSourceProxy` also provides special support for a read-only connection
+pool to use during a read-only transaction, avoiding the overhead of switching the JDBC
+Connection's read-only flag at the beginning and end of every transaction when fetching
+it from the primary connection pool (which may be costly depending on the JDBC driver).
+
 NOTE: As of 5.3, Spring provides an extended `JdbcTransactionManager` variant which adds
 exception translation capabilities on commit/rollback (aligned with `JdbcTemplate`).
 Where `DataSourceTransactionManager` will only ever throw `TransactionSystemException`

framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc

@@ -51,7 +51,7 @@ corresponding to the fully qualified class name of the template instance (typica
 
 The following sections provide some examples of `JdbcTemplate` usage. These examples
 are not an exhaustive list of all of the functionality exposed by the `JdbcTemplate`.
-See the attendant {api-spring-framework}/jdbc/core/JdbcTemplate.html[javadoc] for that.
+See the attendant {spring-framework-api}/jdbc/core/JdbcTemplate.html[javadoc] for that.
 
 [[jdbc-JdbcTemplate-examples-query]]
 === Querying (`SELECT`)

framework-docs/modules/ROOT/pages/data-access/jdbc/embedded-database-support.adoc

@@ -83,7 +83,7 @@ Kotlin::
 ----
 ======
 
-See the {api-spring-framework}/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.html[javadoc for `EmbeddedDatabaseBuilder`]
+See the {spring-framework-api}/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.html[javadoc for `EmbeddedDatabaseBuilder`]
 for further details on all supported options.
 
 You can also use the `EmbeddedDatabaseBuilder` to create an embedded database by using Java
@@ -288,7 +288,7 @@ You can extend Spring JDBC embedded database support in two ways:
   connection pool to manage embedded database connections.
 
 We encourage you to contribute extensions to the Spring community at
-https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
+{spring-framework-issues}[GitHub Issues].
 
 
 

framework-docs/modules/ROOT/pages/data-access/orm/hibernate.adoc

@@ -407,6 +407,12 @@ exposes the Hibernate transaction as a JDBC transaction if you have set up the p
 `DataSource` for which the transactions are supposed to be exposed through the
 `dataSource` property of the `HibernateTransactionManager` class.
 
+For JTA-style lazy retrieval of actual resource connections, Spring provides a
+corresponding `DataSource` proxy class for the target connection pool: see
+{spring-framework-api}/jdbc/datasource/LazyConnectionDataSourceProxy.html[`LazyConnectionDataSourceProxy`].
+This is particularly useful for Hibernate read-only transactions which can often
+be processed from a local cache rather than hitting the database.
+
 
 [[orm-hibernate-resources]]
 == Comparing Container-managed and Locally Defined Resources

framework-docs/modules/ROOT/pages/data-access/orm/introduction.adoc

@@ -58,8 +58,8 @@ The benefits of using the Spring Framework to create your ORM DAOs include:
 
 TIP: For more comprehensive ORM support, including support for alternative database
 technologies such as MongoDB, you might want to check out the
-https://projects.spring.io/spring-data/[Spring Data] suite of projects. If you are
-a JPA user, the https://spring.io/guides/gs/accessing-data-jpa/[Getting Started Accessing
+{spring-site-projects}/spring-data/[Spring Data] suite of projects. If you are
+a JPA user, the {spring-site-guides}/gs/accessing-data-jpa/[Getting Started Accessing
 Data with JPA] guide from https://spring.io provides a great introduction.
 
 

framework-docs/modules/ROOT/pages/data-access/orm/jpa.adoc

@@ -157,7 +157,7 @@ The `LoadTimeWeaver` interface is a Spring-provided class that lets JPA
 `ClassTransformer` instances be plugged in a specific manner, depending on whether the
 environment is a web container or application server. Hooking `ClassTransformers`
 through an
-https://docs.oracle.com/javase/6/docs/api/java/lang/instrument/package-summary.html[agent]
+{java-api}/java.instrument/java/lang/instrument/package-summary.html[agent]
 is typically not efficient. The agents work against the entire virtual machine and
 inspect every class that is loaded, which is usually undesirable in a production
 server environment.
@@ -506,13 +506,20 @@ if you have not already done so, to get more detailed coverage of Spring's decla
 The recommended strategy for JPA is local transactions through JPA's native transaction
 support. Spring's `JpaTransactionManager` provides many capabilities known from local
 JDBC transactions (such as transaction-specific isolation levels and resource-level
-read-only optimizations) against any regular JDBC connection pool (no XA requirement).
+read-only optimizations) against any regular JDBC connection pool, without requiring
+a JTA transaction coordinator and XA-capable resources.
 
 Spring JPA also lets a configured `JpaTransactionManager` expose a JPA transaction
 to JDBC access code that accesses the same `DataSource`, provided that the registered
-`JpaDialect` supports retrieval of the underlying JDBC `Connection`.
-Spring provides dialects for the EclipseLink and Hibernate JPA implementations.
-See the xref:data-access/orm/jpa.adoc#orm-jpa-dialect[next section] for details on the `JpaDialect` mechanism.
+`JpaDialect` supports retrieval of the underlying JDBC `Connection`. Spring provides
+dialects for the EclipseLink and Hibernate JPA implementations. See the
+xref:data-access/orm/jpa.adoc#orm-jpa-dialect[next section] for details on `JpaDialect`.
+
+For JTA-style lazy retrieval of actual resource connections, Spring provides a
+corresponding `DataSource` proxy class for the target connection pool: see
+{spring-framework-api}/jdbc/datasource/LazyConnectionDataSourceProxy.html[`LazyConnectionDataSourceProxy`].
+This is particularly useful for JPA read-only transactions which can often
+be processed from a local cache rather than hitting the database.
 
 
 [[orm-jpa-dialect]]
@@ -541,8 +548,8 @@ way of auto-configuring an `EntityManagerFactory` setup for Hibernate or Eclipse
 respectively. Note that those provider adapters are primarily designed for use with
 Spring-driven transaction management (that is, for use with `JpaTransactionManager`).
 
-See the {api-spring-framework}/orm/jpa/JpaDialect.html[`JpaDialect`] and
-{api-spring-framework}/orm/jpa/JpaVendorAdapter.html[`JpaVendorAdapter`] javadoc for
+See the {spring-framework-api}/orm/jpa/JpaDialect.html[`JpaDialect`] and
+{spring-framework-api}/orm/jpa/JpaVendorAdapter.html[`JpaVendorAdapter`] javadoc for
 more details of its operations and how they are used within Spring's JPA support.
 
 

framework-docs/modules/ROOT/pages/data-access/oxm.adoc

@@ -36,8 +36,8 @@ simpler.
 [[oxm-consistent-interfaces]]
 === Consistent Interfaces
 
-Spring's O-X mapping operates through two global interfaces: {api-spring-framework}/oxm/Marshaller.html[`Marshaller`] and
-{api-spring-framework}/oxm/Unmarshaller.html[`Unmarshaller`]. These abstractions let you switch O-X mapping frameworks
+Spring's O-X mapping operates through two global interfaces: {spring-framework-api}/oxm/Marshaller.html[`Marshaller`] and
+{spring-framework-api}/oxm/Unmarshaller.html[`Unmarshaller`]. These abstractions let you switch O-X mapping frameworks
 with relative ease, with little or no change required on the classes that do the
 marshalling. This approach has the additional benefit of making it possible to do XML
 marshalling with a mix-and-match approach (for example, some marshalling performed using JAXB
@@ -557,7 +557,7 @@ set the `supportedClasses` property on the `XStreamMarshaller`, as the following
 Doing so ensures that only the registered classes are eligible for unmarshalling.
 
 Additionally, you can register
-{api-spring-framework}/oxm/xstream/XStreamMarshaller.html#setConverters(com.thoughtworks.xstream.converters.ConverterMatcher...)[custom
+{spring-framework-api}/oxm/xstream/XStreamMarshaller.html#setConverters(com.thoughtworks.xstream.converters.ConverterMatcher...)[custom
 converters] to make sure that only your supported classes can be unmarshalled. You might
 want to add a `CatchAllConverter` as the last converter in the list, in addition to
 converters that explicitly support the domain classes that should be supported. As a

framework-docs/modules/ROOT/pages/data-access/r2dbc.adoc

@@ -95,7 +95,7 @@ parameter to database bind marker translation.
  run.
 * `….namedParameters(false)`: Disable named parameter expansion. Enabled by default.
 
-TIP: Dialects are resolved by {api-spring-framework}/r2dbc/core/binding/BindMarkersFactoryResolver.html[`BindMarkersFactoryResolver`]
+TIP: Dialects are resolved by {spring-framework-api}/r2dbc/core/binding/BindMarkersFactoryResolver.html[`BindMarkersFactoryResolver`]
  from a `ConnectionFactory`, typically by inspecting `ConnectionFactoryMetadata`.
  +
 You can let Spring auto-discover your `BindMarkersFactory` by registering a
@@ -120,7 +120,7 @@ the reactive sequence to aid debugging.
 
 The following sections provide some examples of `DatabaseClient` usage. These examples
 are not an exhaustive list of all of the functionality exposed by the `DatabaseClient`.
-See the attendant {api-spring-framework}/r2dbc/core/DatabaseClient.html[javadoc] for that.
+See the attendant {spring-framework-api}/r2dbc/core/DatabaseClient.html[javadoc] for that.
 
 [[r2dbc-DatabaseClient-examples-statement]]
 ==== Executing Statements
@@ -752,7 +752,7 @@ the same time, have this client participating in Spring managed transactions. It
 preferable to integrate a R2DBC client with proper access to `ConnectionFactoryUtils`
 for resource management.
 
-See the {api-spring-framework}/r2dbc/connection/TransactionAwareConnectionFactoryProxy.html[`TransactionAwareConnectionFactoryProxy`]
+See the {spring-framework-api}/r2dbc/connection/TransactionAwareConnectionFactoryProxy.html[`TransactionAwareConnectionFactoryProxy`]
 javadoc for more details.
 
 

framework-docs/modules/ROOT/pages/data-access/transaction/application-server-integration.adoc

@@ -7,7 +7,7 @@ the JTA `UserTransaction` and `TransactionManager` objects) autodetects the loca
 the latter object, which varies by application server. Having access to the JTA
 `TransactionManager` allows for enhanced transaction semantics -- in particular,
 supporting transaction suspension. See the
-{api-spring-framework}/transaction/jta/JtaTransactionManager.html[`JtaTransactionManager`]
+{spring-framework-api}/transaction/jta/JtaTransactionManager.html[`JtaTransactionManager`]
 javadoc for details.
 
 Spring's `JtaTransactionManager` is the standard choice to run on Jakarta EE application

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/annotations.adoc

@@ -85,7 +85,7 @@ subclass-level annotation.
 When a POJO class such as the one above is defined as a bean in a Spring context,
 you can make the bean instance transactional through an `@EnableTransactionManagement`
 annotation in a `@Configuration` class. See the
-{api-spring-framework}/transaction/annotation/EnableTransactionManagement.html[javadoc]
+{spring-framework-api}/transaction/annotation/EnableTransactionManagement.html[javadoc]
 for full details.
 
 In XML configuration, the `<tx:annotation-driven/>` tag provides similar convenience:
@@ -262,7 +262,7 @@ is modified) to support `@Transactional` runtime behavior on any kind of method.
 | XML Attribute| Annotation Attribute| Default| Description
 
 | `transaction-manager`
-| N/A (see {api-spring-framework}/transaction/annotation/TransactionManagementConfigurer.html[`TransactionManagementConfigurer`] javadoc)
+| N/A (see {spring-framework-api}/transaction/annotation/TransactionManagementConfigurer.html[`TransactionManagementConfigurer`] javadoc)
 | `transactionManager`
 | Name of the transaction manager to use. Required only if the name of the transaction
   manager is not `transactionManager`, as in the preceding example.

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/aspectj.adoc

@@ -57,8 +57,7 @@ transaction semantics given by the class annotation (if present). You can annota
 regardless of visibility.
 
 To weave your applications with the `AnnotationTransactionAspect`, you must either build
-your application with AspectJ (see the
-https://www.eclipse.org/aspectj/doc/released/devguide/index.html[AspectJ Development
+your application with AspectJ (see the {aspectj-docs-devguide}/index.html[AspectJ Development
 Guide]) or use load-time weaving. See xref:core/aop/using-aspectj.adoc#aop-aj-ltw[Load-time weaving with AspectJ in the Spring Framework]
  for a discussion of load-time weaving with AspectJ.
 

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/tx-propagation.adoc

@@ -75,6 +75,6 @@ that it can roll back to. Such partial rollbacks let an inner transaction scope
 trigger a rollback for its scope, with the outer transaction being able to continue
 the physical transaction despite some operations having been rolled back. This setting
 is typically mapped onto JDBC savepoints, so it works only with JDBC resource
-transactions. See Spring's {api-spring-framework}/jdbc/datasource/DataSourceTransactionManager.html[`DataSourceTransactionManager`].
+transactions. See Spring's {spring-framework-api}/jdbc/datasource/DataSourceTransactionManager.html[`DataSourceTransactionManager`].
 
 

framework-docs/modules/ROOT/pages/data-access/transaction/event.adoc

@@ -63,7 +63,7 @@ For the former, listeners are guaranteed to see the current thread-bound transac
 Since the latter uses the Reactor context instead of thread-local variables, the transaction
 context needs to be included in the published event instance as the event source.
 See the
-{api-spring-framework}/transaction/reactive/TransactionalEventPublisher.html[`TransactionalEventPublisher`]
+{spring-framework-api}/transaction/reactive/TransactionalEventPublisher.html[`TransactionalEventPublisher`]
 javadoc for details.
 ====
 

framework-docs/modules/ROOT/pages/index.adoc

@@ -19,7 +19,7 @@ xref:integration.adoc[Integration] :: REST Clients, JMS, JCA, JMX,
 Email, Tasks, Scheduling, Caching, Observability, JVM Checkpoint Restore.
 xref:languages.adoc[Languages] :: Kotlin, Groovy, Dynamic Languages.
 xref:testing/appendix.adoc[Appendix] :: Spring properties.
-https://github.com/spring-projects/spring-framework/wiki[Wiki] :: What's New,
+{spring-framework-wiki}[Wiki] :: What's New,
 Upgrade Notes, Supported Versions, additional cross-version information.
 
 Rod Johnson, Juergen Hoeller, Keith Donald, Colin Sampaleanu, Rob Harrop, Thomas Risberg,

framework-docs/modules/ROOT/pages/integration/cache/annotations.adoc

@@ -67,7 +67,7 @@ To provide a different default key generator, you need to implement the
 The default key generation strategy changed with the release of Spring 4.0. Earlier
 versions of Spring used a key generation strategy that, for multiple key parameters,
 considered only the `hashCode()` of parameters and not `equals()`. This could cause
-unexpected key collisions (see https://jira.spring.io/browse/SPR-10237[SPR-10237]
+unexpected key collisions (see {spring-framework-issues}/14870[spring-framework#14870]
 for background). The new `SimpleKeyGenerator` uses a compound key for such scenarios.
 
 If you want to keep using the previous key strategy, you can configure the deprecated
@@ -566,7 +566,7 @@ switching to `aspectj` mode in combination with compile-time or load-time weavin
 
 NOTE: For more detail about advanced customizations (using Java configuration) that are
 required to implement `CachingConfigurer`, see the
-{api-spring-framework}/cache/annotation/CachingConfigurer.html[javadoc].
+{spring-framework-api}/cache/annotation/CachingConfigurer.html[javadoc].
 
 [[cache-annotation-driven-settings]]
 .Cache annotation settings
@@ -575,7 +575,7 @@ required to implement `CachingConfigurer`, see the
 | XML Attribute | Annotation Attribute | Default | Description
 
 | `cache-manager`
-| N/A (see the {api-spring-framework}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
+| N/A (see the {spring-framework-api}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
 | `cacheManager`
 | The name of the cache manager to use. A default `CacheResolver` is initialized behind
   the scenes with this cache manager (or `cacheManager` if not set). For more
@@ -583,19 +583,19 @@ required to implement `CachingConfigurer`, see the
   attribute.
 
 | `cache-resolver`
-| N/A (see the {api-spring-framework}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
+| N/A (see the {spring-framework-api}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
 | A `SimpleCacheResolver` using the configured `cacheManager`.
 | The bean name of the CacheResolver that is to be used to resolve the backing caches.
   This attribute is not required and needs to be specified only as an alternative to
   the 'cache-manager' attribute.
 
 | `key-generator`
-| N/A (see the {api-spring-framework}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
+| N/A (see the {spring-framework-api}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
 | `SimpleKeyGenerator`
 | Name of the custom key generator to use.
 
 | `error-handler`
-| N/A (see the {api-spring-framework}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
+| N/A (see the {spring-framework-api}/cache/annotation/CachingConfigurer.html[`CachingConfigurer`] javadoc)
 | `SimpleCacheErrorHandler`
 | The name of the custom cache error handler to use. By default, any exception thrown during
   a cache related operation is thrown back at the client.

framework-docs/modules/ROOT/pages/integration/checkpoint-restore.adoc

@@ -1,22 +1,21 @@
 [[checkpoint-restore]]
 = JVM Checkpoint Restore
 
-The Spring Framework integrates with checkpoint/restore as implemented by https://github.com/CRaC/docs[Project CRaC] in order to allow implementing systems capable to reduce the startup and warmup times of Spring-based Java applications with the JVM.
+The Spring Framework integrates with checkpoint/restore as implemented by https://github.com/CRaC/docs[Project CRaC] in order to allow implementing systems capable of reducing the startup and warmup times of Spring-based Java applications with the JVM.
 
 Using this feature requires:
 
 * A checkpoint/restore enabled JVM (Linux only for now).
-* The presence in the classpath of the https://github.com/CRaC/org.crac[`org.crac:crac`] library (version `1.4.0` and above are supported).
-* Specifying the required `java` command line parameters like `-XX:CRaCCheckpointTo=PATH` or `-XX:CRaCRestoreFrom=PATH`.
+* The presence of the https://github.com/CRaC/org.crac[`org.crac:crac`] library (version `1.4.0` and above are supported) in the classpath.
+* Specifying the required `java` command-line parameters like `-XX:CRaCCheckpointTo=PATH` or `-XX:CRaCRestoreFrom=PATH`.
 
-WARNING: The files generated in the path specified by `-XX:CRaCCheckpointTo=PATH` when a checkpoint is requested contain a representation of the memory of the running JVM, which may contain secrets and other sensitive data. Using this feature should be done with the assumption that any value "seen" by the JVM, such as configuration properties coming from the environment, will be stored in those CRaC files. As a consequence, the security implications of where and how those files are generated, stored and accessed should be carefully assessed.
+WARNING: The files generated in the path specified by `-XX:CRaCCheckpointTo=PATH` when a checkpoint is requested contain a representation of the memory of the running JVM, which may contain secrets and other sensitive data. Using this feature should be done with the assumption that any value "seen" by the JVM, such as configuration properties coming from the environment, will be stored in those CRaC files. As a consequence, the security implications of where and how those files are generated, stored, and accessed should be carefully assessed.
 
-Conceptually, checkpoint and restore match with xref:core/beans/factory-nature.adoc#beans-factory-lifecycle-processor[Spring `Lifecycle` contract] for individual beans.
+Conceptually, checkpoint and restore align with the xref:core/beans/factory-nature.adoc#beans-factory-lifecycle-processor[Spring `Lifecycle` contract] for individual beans.
 
-== On demand checkpoint/restore of a running application
+== On-demand checkpoint/restore of a running application
 
-A checkpoint can be created on demand, for example using a command like `jcmd application.jar JDK.checkpoint`. Before the creation of the checkpoint, Spring Framework
-stops all the running beans, giving them a chance to close resources if needed by implementing `Lifecycle.stop`. After restore, the same beans are restarted, with `Lifecycle.start` allowing to reopen resources when relevant. For libraries not depending on Spring, checkpoint/restore custom integration can be provided by implementing `org.crac.Resource` and registering the related instance.
+A checkpoint can be created on demand, for example using a command like `jcmd application.jar JDK.checkpoint`. Before the creation of the checkpoint, Spring stops all the running beans, giving them a chance to close resources if needed by implementing `Lifecycle.stop`. After restore, the same beans are restarted, with `Lifecycle.start` allowing beans to reopen resources when relevant. For libraries that do not depend on Spring, custom checkpoint/restore integration can be provided by implementing `org.crac.Resource` and registering the related instance.
 
 WARNING: Leveraging checkpoint/restore of a running application typically requires additional lifecycle management to gracefully stop and start using resources like files or sockets and stop active threads.
 
@@ -24,8 +23,16 @@ NOTE: If the checkpoint is created on a warmed-up JVM, the restored JVM will be
 
 == Automatic checkpoint/restore at startup
 
-When the `-Dspring.context.checkpoint=onRefresh` Java system property is set, a checkpoint is created automatically during the startup at `LifecycleProcessor.onRefresh` level. At this phase, all non-lazy initialized singletons are instantiated, `InitializingBean.afterPropertiesSet` callbacks have been invoked, but not `Lifecycle.start` ones and `ContextRefreshedEvent` has not yet been published.
+When the `-Dspring.context.checkpoint=onRefresh` JVM system property is set, a checkpoint is created automatically at
+startup during the `LifecycleProcessor.onRefresh` phase. After this phase has completed, all non-lazy initialized singletons have been instantiated, and
+`InitializingBean#afterPropertiesSet` callbacks have been invoked; but the lifecycle has not started, and the 
+`ContextRefreshedEvent` has not yet been published.
+
+For testing purposes, it is also possible to leverage the `-Dspring.context.exit=onRefresh` JVM system property which
+triggers similar behavior, but instead of creating a checkpoint, it exits your Spring application at the same lifecycle
+phase without requiring the Project CraC dependency/JVM or Linux. This can be useful to check if connections to remote
+services are required when the beans are not started, and potentially refine the configuration to avoid that.
 
 WARNING: As mentioned above, and especially in use cases where the CRaC files are shipped as part of a deployable artifact (a container image for example), operate with the assumption that any sensitive data "seen" by the JVM ends up in the CRaC files, and assess carefully the related security implications.
 
-NOTE: Here checkpoint/restore is a way to "fast-forward" the startup of the application to a phase where the application context is about to start, but does not allow to have a fully warmed-up JVM.
+NOTE: Automatic checkpoint/restore is a way to "fast-forward" the startup of the application to a phase where the application context is about to start, but it does not allow to have a fully warmed-up JVM.

framework-docs/modules/ROOT/pages/integration/class-data-sharing.adoc

@@ -0,0 +1,64 @@
+[[class-data-sharing]]
+= Class Data Sharing
+
+Class Data Sharing (CDS) is a https://docs.oracle.com/en/java/javase/17/vm/class-data-sharing.html[JVM feature]
+that can help reduce the startup time and memory footprint of Java applications.
+
+To use this feature, a CDS archive should be created for the particular classpath of the
+application. The Spring Framework provides a hook-point to ease the creation of the
+archive. Once the archive is available, users should opt in to use it via a JVM flag.
+
+== Creating the CDS Archive
+
+A CDS archive for an application can be created when the application exits. The Spring
+Framework provides a mode of operation where the process can exit automatically once the
+`ApplicationContext` has refreshed. In this mode, all non-lazy initialized singletons
+have been instantiated, and `InitializingBean#afterPropertiesSet` callbacks have been
+invoked; but the lifecycle has not started, and the `ContextRefreshedEvent` has not yet
+been published.
+
+To create the archive, two additional JVM flags must be specified:
+
+* `-XX:ArchiveClassesAtExit=application.jsa`: creates the CDS archive on exit
+* `-Dspring.context.exit=onRefresh`: starts and then immediately exits your Spring
+  application as described above
+
+To create a CDS archive, your JDK must have a base image. If you add the flags above to
+your startup script, you may get a warning that looks like this:
+
+[source,shell,indent=0,subs="verbatim"]
+----
+  -XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info.
+----
+
+The base CDS archive can be created by issuing the following command:
+
+[source,shell,indent=0,subs="verbatim"]
+----
+  $ java -Xshare:dump
+----
+
+== Using the Archive
+
+Once the archive is available, add `-XX:SharedArchiveFile=application.jsa` to your startup
+script to use it, assuming an `application.jsa` file in the working directory.
+
+To figure out how effective the cache is, you can enable class loading logs by adding
+an extra attribute: `-Xlog:class+load:file=cds.log`. This creates a `cds.log` with every
+attempt to load a class and its source. Classes that are loaded from the cache should have
+a "shared objects file" source, as shown in the following example:
+
+[source,shell,indent=0,subs="verbatim"]
+----
+    [0.064s][info][class,load] org.springframework.core.env.EnvironmentCapable source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.BeanFactory source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.ListableBeanFactory source: shared objects file (top)
+    [0.064s][info][class,load] org.springframework.beans.factory.HierarchicalBeanFactory source: shared objects file (top)
+    [0.065s][info][class,load] org.springframework.context.MessageSource source: shared objects file (top)
+----
+
+TIP: If you have a large number of classes that are not loaded from the cache, make sure that
+the JDK and classpath used by the commands that create the archive and start the application
+are identical. Note also that to effectively cache classes, the classpath should be specified
+as a list of JARs containing those classes, and avoid the usage of directories and `*`
+wildcard characters.

framework-docs/modules/ROOT/pages/integration/email.adoc

@@ -26,7 +26,7 @@ interface. A simple value object that encapsulates the properties of a simple ma
 as `from` and `to` (plus many others) is the `SimpleMailMessage` class. This package
 also contains a hierarchy of checked exceptions that provide a higher level of
 abstraction over the lower level mail system exceptions, with the root exception being
-`MailException`. See the {api-spring-framework}/mail/MailException.html[javadoc]
+`MailException`. See the {spring-framework-api}/mail/MailException.html[javadoc]
 for more information on the rich mail exception hierarchy.
 
 The `org.springframework.mail.javamail.JavaMailSender` interface adds specialized

framework-docs/modules/ROOT/pages/integration/jms/annotated.adoc

@@ -64,7 +64,7 @@ You can customize the listener container factory to use for each annotation or y
 configure an explicit default by implementing the `JmsListenerConfigurer` interface.
 The default is required only if at least one endpoint is registered without a specific
 container factory. See the javadoc of classes that implement
-{api-spring-framework}/jms/annotation/JmsListenerConfigurer.html[`JmsListenerConfigurer`]
+{spring-framework-api}/jms/annotation/JmsListenerConfigurer.html[`JmsListenerConfigurer`]
 for details and examples.
 
 If you prefer xref:integration/jms/namespace.adoc[XML configuration], you can use the `<jms:annotation-driven>`

framework-docs/modules/ROOT/pages/integration/jms/jca-message-endpoint-manager.adoc

@@ -64,9 +64,9 @@ In some environments, you can instead obtain the entire `ResourceAdapter` object
 (by using `<jee:jndi-lookup>`). The Spring-based message listeners can then interact with
 the server-hosted `ResourceAdapter`, which also use the server's built-in `WorkManager`.
 
-See the javadoc for {api-spring-framework}/jms/listener/endpoint/JmsMessageEndpointManager.html[`JmsMessageEndpointManager`],
-{api-spring-framework}/jms/listener/endpoint/JmsActivationSpecConfig.html[`JmsActivationSpecConfig`],
-and {api-spring-framework}/jca/support/ResourceAdapterFactoryBean.html[`ResourceAdapterFactoryBean`]
+See the javadoc for {spring-framework-api}/jms/listener/endpoint/JmsMessageEndpointManager.html[`JmsMessageEndpointManager`],
+{spring-framework-api}/jms/listener/endpoint/JmsActivationSpecConfig.html[`JmsActivationSpecConfig`],
+and {spring-framework-api}/jca/support/ResourceAdapterFactoryBean.html[`ResourceAdapterFactoryBean`]
 for more details.
 
 Spring also provides a generic JCA message endpoint manager that is not tied to JMS:
@@ -74,7 +74,7 @@ Spring also provides a generic JCA message endpoint manager that is not tied to
 for using any message listener type (such as a JMS `MessageListener`) and any
 provider-specific `ActivationSpec` object. See your JCA provider's documentation to
 find out about the actual capabilities of your connector, and see the
-{api-spring-framework}/jca/endpoint/GenericMessageEndpointManager.html[`GenericMessageEndpointManager`]
+{spring-framework-api}/jca/endpoint/GenericMessageEndpointManager.html[`GenericMessageEndpointManager`]
 javadoc for the Spring-specific configuration details.
 
 NOTE: JCA-based message endpoint management is very analogous to EJB 2.1 Message-Driven Beans.

framework-docs/modules/ROOT/pages/integration/jms/namespace.adoc

@@ -113,7 +113,7 @@ as the following example shows:
 ----
 
 The following table describes all available attributes. See the class-level javadoc
-of the {api-spring-framework}/jms/listener/AbstractMessageListenerContainer.html[`AbstractMessageListenerContainer`]
+of the {spring-framework-api}/jms/listener/AbstractMessageListenerContainer.html[`AbstractMessageListenerContainer`]
 and its concrete subclasses for more details on the individual properties. The javadoc
 also provides a discussion of transaction choices and message redelivery scenarios.
 
@@ -254,7 +254,7 @@ The following table describes the available configuration options for the JCA va
 
 | `activation-spec-factory`
 | A reference to the `JmsActivationSpecFactory`. The default is to autodetect the JMS
-  provider and its `ActivationSpec` class (see {api-spring-framework}/jms/listener/endpoint/DefaultJmsActivationSpecFactory.html[`DefaultJmsActivationSpecFactory`]).
+  provider and its `ActivationSpec` class (see {spring-framework-api}/jms/listener/endpoint/DefaultJmsActivationSpecFactory.html[`DefaultJmsActivationSpecFactory`]).
 
 | `destination-resolver`
 | A reference to the `DestinationResolver` strategy for resolving JMS `Destinations`.

framework-docs/modules/ROOT/pages/integration/jms/receiving.adoc

@@ -76,7 +76,7 @@ containers that ships with Spring (in this case, `DefaultMessageListenerContaine
 ----
 
 See the Spring javadoc of the various message listener containers (all of which implement
-{api-spring-framework}/jms/listener/MessageListenerContainer.html[MessageListenerContainer])
+{spring-framework-api}/jms/listener/MessageListenerContainer.html[MessageListenerContainer])
 for a full description of the features supported by each implementation.
 
 

framework-docs/modules/ROOT/pages/integration/jms/using.adoc

@@ -234,7 +234,7 @@ use a proper cache level in such a case.
 This container also has recoverable capabilities when the broker goes down. By default,
 a simple `BackOff` implementation retries every five seconds. You can specify
 a custom `BackOff` implementation for more fine-grained recovery options. See
-{api-spring-framework}/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
+{spring-framework-api}/util/backoff/ExponentialBackOff.html[`ExponentialBackOff`] for an example.
 
 NOTE: Like its sibling (xref:integration/jms/using.adoc#jms-mdp-simple[`SimpleMessageListenerContainer`]),
 `DefaultMessageListenerContainer` supports native JMS transactions and allows for

framework-docs/modules/ROOT/pages/integration/jmx/notifications.adoc

@@ -246,7 +246,7 @@ instance. The `NotificationPublisherAware` interface supplies an instance of a
 which the bean can then use to publish `Notifications`.
 
 As stated in the javadoc of the
-{api-spring-framework}/jmx/export/notification/NotificationPublisher.html[`NotificationPublisher`]
+{spring-framework-api}/jmx/export/notification/NotificationPublisher.html[`NotificationPublisher`]
 interface, managed beans that publish events through the `NotificationPublisher`
 mechanism are not responsible for the state management of notification listeners.
 Spring's JMX support takes care of handling all the JMX infrastructure issues.

framework-docs/modules/ROOT/pages/integration/jmx/resources.adoc

@@ -6,10 +6,8 @@ This section contains links to further resources about JMX:
 
 * The https://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html[JMX
 homepage] at Oracle.
-* The https://jcp.org/aboutJava/communityprocess/final/jsr003/index3.html[JMX
-  specification] (JSR-000003).
-* The https://jcp.org/aboutJava/communityprocess/final/jsr160/index.html[JMX Remote API
-  specification] (JSR-000160).
+* The {JSR}003[JMX specification] (JSR-000003).
+* The {JSR}160[JMX Remote API specification] (JSR-000160).
 * The http://mx4j.sourceforge.net/[MX4J homepage]. (MX4J is an open-source implementation of
   various JMX specs.)
 

framework-docs/modules/ROOT/pages/integration/observability.adoc

@@ -7,7 +7,7 @@ Metrics can help you to track error rates, usage patterns, performance, and more
 Traces provide a holistic view of an entire system, crossing application boundaries; you can zoom in on particular user requests and follow their entire completion across applications.
 
 Spring Framework instruments various parts of its own codebase to publish observations if an `ObservationRegistry` is configured.
-You can learn more about {docs-spring-boot}/html/actuator.html#actuator.metrics[configuring the observability infrastructure in Spring Boot].
+You can learn more about {spring-boot-docs}/actuator.html#actuator.metrics[configuring the observability infrastructure in Spring Boot].
 
 
 [[observability.list]]

framework-docs/modules/ROOT/pages/integration/rest-clients.adoc

@@ -344,7 +344,7 @@ The `spring-web` module contains the `HttpMessageConverter` interface for readin
 Concrete implementations for the main media (MIME) types are provided in the framework and are, by default, registered with the `RestClient` and `RestTemplate` on the client side and with `RequestMappingHandlerAdapter` on the server side (see xref:web/webmvc/mvc-config/message-converters.adoc[Configuring Message Converters]).
 
 Several implementations of `HttpMessageConverter` are described below.
-Refer to the {api-spring-framework}/http/converter/HttpMessageConverter.html[`HttpMessageConverter` Javadoc] for the complete list.
+Refer to the {spring-framework-api}/http/converter/HttpMessageConverter.html[`HttpMessageConverter` Javadoc] for the complete list.
 For all converters, a default media type is used, but you can override it by setting the `supportedMediaTypes`  property.
 
 [[rest-message-converters-tbl]]
@@ -384,7 +384,7 @@ When you need further control (for cases where custom JSON serializers/deseriali
 By default, this converter supports `application/json`.
 
 | `MappingJackson2XmlHttpMessageConverter`
-| An `HttpMessageConverter` implementation that can read and write XML by using https://github.com/FasterXML/jackson-dataformat-xml[Jackson XML] extension's `XmlMapper`.
+| An `HttpMessageConverter` implementation that can read and write XML by using {jackson-github-org}/jackson-dataformat-xml[Jackson XML] extension's `XmlMapper`.
 You can customize XML mapping as needed through the use of JAXB or Jackson's provided annotations.
 When you need further control (for cases where custom XML serializers/deserializers need to be provided for specific types), you can inject a custom `XmlMapper` through the `ObjectMapper` property.
 By default, this converter supports `application/xml`.
@@ -401,7 +401,7 @@ You can also set the message converters to use explicitly, by using `messageConv
 
 ==== Jackson JSON Views
 
-To serialize only a subset of the object properties, you can specify a https://www.baeldung.com/jackson-json-view-annotation[Jackson JSON View], as the following example shows:
+To serialize only a subset of the object properties, you can specify a {baeldung-blog}/jackson-json-view-annotation[Jackson JSON View], as the following example shows:
 
 [source,java,indent=0,subs="verbatim"]
 ----

framework-docs/modules/ROOT/pages/integration/scheduling.adoc

@@ -282,8 +282,8 @@ You can pick and choose the relevant annotations for your application. For examp
 if you need only support for `@Scheduled`, you can omit `@EnableAsync`. For more
 fine-grained control, you can additionally implement the `SchedulingConfigurer`
 interface, the `AsyncConfigurer` interface, or both. See the
-{api-spring-framework}/scheduling/annotation/SchedulingConfigurer.html[`SchedulingConfigurer`]
-and {api-spring-framework}/scheduling/annotation/AsyncConfigurer.html[`AsyncConfigurer`]
+{spring-framework-api}/scheduling/annotation/SchedulingConfigurer.html[`SchedulingConfigurer`]
+and {spring-framework-api}/scheduling/annotation/AsyncConfigurer.html[`AsyncConfigurer`]
 javadoc for full details.
 
 If you prefer XML configuration, you can use the `<task:annotation-driven>` element,
@@ -722,7 +722,7 @@ In the preceding configuration, a `queue-capacity` value has also been provided.
 The configuration of the thread pool should also be considered in light of the
 executor's queue capacity. For the full description of the relationship between pool
 size and queue capacity, see the documentation for
-https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ThreadPoolExecutor.html[`ThreadPoolExecutor`].
+{java-api}/java.base/java/util/concurrent/ThreadPoolExecutor.html[`ThreadPoolExecutor`].
 The main idea is that, when a task is submitted, the executor first tries to use a
 free thread if the number of active threads is currently less than the core size.
 If the core size has been reached, the task is added to the queue, as long as its
@@ -1093,7 +1093,7 @@ we need to set up the `SchedulerFactoryBean`, as the following example shows:
 
 More properties are available for the `SchedulerFactoryBean`, such as the calendars used by the
 job details, properties to customize Quartz with, and a Spring-provided JDBC DataSource. See
-the {api-spring-framework}/scheduling/quartz/SchedulerFactoryBean.html[`SchedulerFactoryBean`]
+the {spring-framework-api}/scheduling/quartz/SchedulerFactoryBean.html[`SchedulerFactoryBean`]
 javadoc for more information.
 
 NOTE: `SchedulerFactoryBean` also recognizes a `quartz.properties` file in the classpath,

framework-docs/modules/ROOT/pages/languages/kotlin.adoc

@@ -2,9 +2,9 @@
 = Kotlin
 :page-section-summary-toc: 1
 
-https://kotlinlang.org[Kotlin] is a statically typed language that targets the JVM
+{kotlin-site}[Kotlin] is a statically typed language that targets the JVM
 (and other platforms) which allows writing concise and elegant code while providing
-very good https://kotlinlang.org/docs/reference/java-interop.html[interoperability]
+very good {kotlin-docs}/java-interop.html[interoperability]
 with existing libraries written in Java.
 
 The Spring Framework provides first-class support for Kotlin and lets developers write
@@ -13,13 +13,13 @@ Most of the code samples of the reference documentation are
 provided in Kotlin in addition to Java.
 
 The easiest way to build a Spring application with Kotlin is to leverage Spring Boot and
-its https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-kotlin.html[dedicated Kotlin support].
-https://spring.io/guides/tutorials/spring-boot-kotlin/[This comprehensive tutorial]
+its{spring-boot-docs}/boot-features-kotlin.html[dedicated Kotlin support].
+{spring-site-guides}/tutorials/spring-boot-kotlin/[This comprehensive tutorial]
 will teach you how to build Spring Boot applications with Kotlin using https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
 
 Feel free to join the #spring channel of https://slack.kotlinlang.org/[Kotlin Slack]
 or ask a question with `spring` and `kotlin` as tags on
-https://stackoverflow.com/questions/tagged/spring+kotlin[Stackoverflow] if you need support.
+{stackoverflow-spring-kotlin-tags}[Stackoverflow] if you need support.
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/annotations.adoc

@@ -1,7 +1,7 @@
 [[kotlin-annotations]]
 = Annotations
 
-The Spring Framework also takes advantage of https://kotlinlang.org/docs/reference/null-safety.html[Kotlin null-safety]
+The Spring Framework also takes advantage of {kotlin-docs}/null-safety.html[Kotlin null-safety]
 to determine if an HTTP parameter is required without having to explicitly
 define the `required` attribute. That means `@RequestParam name: String?` is treated
 as not required and, conversely, `@RequestParam name: String` is treated as being required.
@@ -20,9 +20,9 @@ type `Car` may or may not exist. The same behavior applies to autowired construc
 
 NOTE: If you use bean validation on classes with properties or a primary constructor
 parameters, you may need to use
-https://kotlinlang.org/docs/reference/annotations.html#annotation-use-site-targets[annotation use-site targets],
+{kotlin-docs}/annotations.html#annotation-use-site-targets[annotation use-site targets],
 such as `@field:NotNull` or `@get:Size(min=5, max=15)`, as described in
-https://stackoverflow.com/a/35853200/1092077[this Stack Overflow response].
+{stackoverflow-site}/a/35853200/1092077[this Stack Overflow response].
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/bean-definition-dsl.adoc

@@ -51,7 +51,7 @@ the constructor parameters will be autowired by type:
 ----
 
 In order to allow a more declarative approach and cleaner syntax, Spring Framework provides
-a {docs-spring-framework}/kdoc-api/spring-context/org.springframework.context.support/-bean-definition-dsl/index.html[Kotlin bean definition DSL]
+a {spring-framework-api-kdoc}/spring-context/org.springframework.context.support/-bean-definition-dsl/index.html[Kotlin bean definition DSL]
 It declares an `ApplicationContextInitializer` through a clean declarative API,
 which lets you deal with profiles and `Environment` for customizing
 how beans are registered.
@@ -104,10 +104,10 @@ as the following example shows:
 ----
 
 NOTE: Spring Boot is based on JavaConfig and
-https://github.com/spring-projects/spring-boot/issues/8115[does not yet provide specific support for functional bean definition],
+{spring-boot-issues}/8115[does not yet provide specific support for functional bean definition],
 but you can experimentally use functional bean definitions through Spring Boot's `ApplicationContextInitializer` support.
-See https://stackoverflow.com/questions/45935931/how-to-use-functional-bean-definition-kotlin-dsl-with-spring-boot-and-spring-w/46033685#46033685[this Stack Overflow answer]
-for more details and up-to-date information. See also the experimental Kofu DSL developed in https://github.com/spring-projects/spring-fu[Spring Fu incubator].
+See {stackoverflow-questions}/45935931/how-to-use-functional-bean-definition-kotlin-dsl-with-spring-boot-and-spring-w/46033685#46033685[this Stack Overflow answer]
+for more details and up-to-date information. See also the experimental Kofu DSL developed in {spring-github-org}/spring-fu[Spring Fu incubator].
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/classes-interfaces.adoc

@@ -12,7 +12,7 @@ compiler flag to be enabled during compilation. (For completeness, we neverthele
 running the Kotlin compiler with its `-java-parameters` flag for standard Java parameter exposure.)
 
 You can declare configuration classes as
-https://kotlinlang.org/docs/reference/nested-classes.html[top level or nested but not inner],
+{kotlin-docs}/nested-classes.html[top level or nested but not inner],
 since the later requires a reference to the outer class.
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/coroutines.adoc

@@ -1,21 +1,21 @@
 [[coroutines]]
 = Coroutines
 
-Kotlin https://kotlinlang.org/docs/reference/coroutines-overview.html[Coroutines] are Kotlin
+Kotlin {kotlin-docs}/coroutines-overview.html[Coroutines] are Kotlin
 lightweight threads allowing to write non-blocking code in an imperative way. On language side,
 suspending functions provides an abstraction for asynchronous operations while on library side
-https://github.com/Kotlin/kotlinx.coroutines[kotlinx.coroutines] provides functions like
-https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/async.html[`async { }`]
-and types like https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[`Flow`].
+{kotlin-github-org}/kotlinx.coroutines[kotlinx.coroutines] provides functions like
+{kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines/async.html[`async { }`]
+and types like {kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[`Flow`].
 
 Spring Framework provides support for Coroutines on the following scope:
 
-* https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/-deferred/index.html[Deferred] and https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[Flow] return values support in Spring MVC and WebFlux annotated `@Controller`
+* {kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines/-deferred/index.html[Deferred] and {kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[Flow] return values support in Spring MVC and WebFlux annotated `@Controller`
 * Suspending function support in Spring MVC and WebFlux annotated `@Controller`
-* Extensions for WebFlux {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.client/index.html[client] and {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.server/index.html[server] functional API.
-* WebFlux.fn {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }] DSL
+* Extensions for WebFlux {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.client/index.html[client] and {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/index.html[server] functional API.
+* WebFlux.fn {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }] DSL
 * Suspending function and `Flow` support in RSocket `@MessageMapping` annotated methods
-* Extensions for {docs-spring-framework}/kdoc-api/spring-messaging/org.springframework.messaging.rsocket/index.html[`RSocketRequester`]
+* Extensions for {spring-framework-api-kdoc}/spring-messaging/org.springframework.messaging.rsocket/index.html[`RSocketRequester`]
 
 
 
@@ -53,17 +53,17 @@ For input parameters:
 * If laziness is not needed, `fun handler(mono: Mono<T>)` becomes `fun handler(value: T)` since a suspending functions can be invoked to get the value parameter.
 * If laziness is needed, `fun handler(mono: Mono<T>)` becomes `fun handler(supplier: suspend () -> T)` or `fun handler(supplier: suspend () -> T?)`
 
-https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[`Flow`] is `Flux` equivalent in Coroutines world, suitable for hot or cold stream, finite or infinite streams, with the following main differences:
+{kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/index.html[`Flow`] is `Flux` equivalent in Coroutines world, suitable for hot or cold stream, finite or infinite streams, with the following main differences:
 
 * `Flow` is push-based while `Flux` is push-pull hybrid
 * Backpressure is implemented via suspending functions
-* `Flow` has only a https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/collect.html[single suspending `collect` method] and operators are implemented as https://kotlinlang.org/docs/reference/extensions.html[extensions]
-* https://github.com/Kotlin/kotlinx.coroutines/tree/master/kotlinx-coroutines-core/common/src/flow/operators[Operators are easy to implement] thanks to Coroutines
+* `Flow` has only a {kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines.flow/-flow/collect.html[single suspending `collect` method] and operators are implemented as {kotlin-docs}/extensions.html[extensions]
+* {kotlin-github-org}/kotlinx.coroutines/tree/master/kotlinx-coroutines-core/common/src/flow/operators[Operators are easy to implement] thanks to Coroutines
 * Extensions allow to add custom operators to `Flow`
 * Collect operations are suspending functions
-* https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/map.html[`map` operator] supports asynchronous operation (no need for `flatMap`) since it takes a suspending function parameter
+* {kotlin-coroutines-api}/kotlinx-coroutines-core/kotlinx.coroutines.flow/map.html[`map` operator] supports asynchronous operation (no need for `flatMap`) since it takes a suspending function parameter
 
-Read this blog post about https://spring.io/blog/2019/04/12/going-reactive-with-spring-coroutines-and-kotlin-flow[Going Reactive with Spring, Coroutines and Kotlin Flow]
+Read this blog post about {spring-site-blog}/2019/04/12/going-reactive-with-spring-coroutines-and-kotlin-flow[Going Reactive with Spring, Coroutines and Kotlin Flow]
 for more details, including how to run code concurrently with Coroutines.
 
 
@@ -170,7 +170,7 @@ class CoroutinesViewController(banner: Banner) {
 [[webflux-fn]]
 == WebFlux.fn
 
-Here is an example of Coroutines router defined via the {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }] DSL and related handlers.
+Here is an example of Coroutines router defined via the {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }] DSL and related handlers.
 
 [source,kotlin,indent=0]
 ----

framework-docs/modules/ROOT/pages/languages/kotlin/extensions.adoc

@@ -1,11 +1,11 @@
 [[kotlin-extensions]]
 = Extensions
 
-Kotlin https://kotlinlang.org/docs/reference/extensions.html[extensions] provide the ability
+Kotlin {kotlin-docs}/extensions.html[extensions] provide the ability
 to extend existing classes with additional functionality. The Spring Framework Kotlin APIs
 use these extensions to add new Kotlin-specific conveniences to existing Spring APIs.
 
-The {docs-spring-framework}/kdoc-api/[Spring Framework KDoc API] lists
+The {spring-framework-api-kdoc}/[Spring Framework KDoc API] lists
 and documents all available Kotlin extensions and DSLs.
 
 NOTE: Keep in mind that Kotlin extensions need to be imported to be used. This means,
@@ -13,8 +13,8 @@ for example, that the `GenericApplicationContext.registerBean` Kotlin extension
 is available only if `org.springframework.context.support.registerBean` is imported.
 That said, similar to static imports, an IDE should automatically suggest the import in most cases.
 
-For example, https://kotlinlang.org/docs/reference/inline-functions.html#reified-type-parameters[Kotlin reified type parameters]
-provide a workaround for JVM https://docs.oracle.com/javase/tutorial/java/generics/erasure.html[generics type erasure],
+For example, {kotlin-docs}/inline-functions.html#reified-type-parameters[Kotlin reified type parameters]
+provide a workaround for JVM {java-tutorial}/java/generics/erasure.html[generics type erasure],
 and the Spring Framework provides some extensions to take advantage of this feature.
 This allows for a better Kotlin API `RestTemplate`, for the new `WebClient` from Spring
 WebFlux, and for various other APIs.

framework-docs/modules/ROOT/pages/languages/kotlin/getting-started.adoc

@@ -2,7 +2,7 @@
 = Getting Started
 
 The easiest way to learn how to build a Spring application with Kotlin is to follow
-https://spring.io/guides/tutorials/spring-boot-kotlin/[the dedicated tutorial].
+{spring-site-guides}/tutorials/spring-boot-kotlin/[the dedicated tutorial].
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/null-safety.adoc

@@ -1,20 +1,20 @@
 [[kotlin-null-safety]]
 = Null-safety
 
-One of Kotlin's key features is https://kotlinlang.org/docs/reference/null-safety.html[null-safety],
+One of Kotlin's key features is {kotlin-docs}/null-safety.html[null-safety],
 which cleanly deals with `null` values at compile time rather than bumping into the famous
 `NullPointerException` at runtime. This makes applications safer through nullability
 declarations and expressing "`value or no value`" semantics without paying the cost of wrappers, such as `Optional`.
 (Kotlin allows using functional constructs with nullable values. See this
-https://www.baeldung.com/kotlin-null-safety[comprehensive guide to Kotlin null-safety].)
+{baeldung-blog}/kotlin-null-safety[comprehensive guide to Kotlin null-safety].)
 
 Although Java does not let you express null-safety in its type-system, the Spring Framework
 provides xref:languages/kotlin/null-safety.adoc[null-safety of the whole Spring Framework API]
 via tooling-friendly annotations declared in the `org.springframework.lang` package.
 By default, types from Java APIs used in Kotlin are recognized as
-https://kotlinlang.org/docs/reference/java-interop.html#null-safety-and-platform-types[platform types],
+{kotlin-docs}/java-interop.html#null-safety-and-platform-types[platform types],
 for which null-checks are relaxed.
-https://kotlinlang.org/docs/reference/java-interop.html#jsr-305-support[Kotlin support for JSR-305 annotations]
+{kotlin-docs}/java-interop.html#jsr-305-support[Kotlin support for JSR-305 annotations]
 and Spring nullability annotations provide null-safety for the whole Spring Framework API to Kotlin developers,
 with the advantage of dealing with `null`-related issues at compile time.
 
@@ -30,7 +30,7 @@ API nullability declaration could evolve even between minor releases and that mo
 be added in the future.
 
 NOTE: Generic type arguments, varargs, and array elements nullability are not supported yet,
-but should be in an upcoming release. See https://github.com/Kotlin/KEEP/issues/79[this discussion]
+but should be in an upcoming release. See {kotlin-github-org}/KEEP/issues/79[this discussion]
 for up-to-date information.
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/requirements.adoc

@@ -9,9 +9,9 @@ and https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-reflect[`kotli
 to be present on the classpath. They are provided by default if you bootstrap a Kotlin project on
 https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
 
-WARNING: Kotlin https://kotlinlang.org/docs/inline-classes.html[inline classes] are not yet supported.
+WARNING: Kotlin {kotlin-docs}/inline-classes.html[inline classes] are not yet supported.
 
-NOTE: The https://github.com/FasterXML/jackson-module-kotlin[Jackson Kotlin module] is required
+NOTE: The {jackson-github-org}/jackson-module-kotlin[Jackson Kotlin module] is required
 for serializing or deserializing JSON data for Kotlin classes with Jackson, so make sure to add the
 `com.fasterxml.jackson.module:jackson-module-kotlin` dependency to your project if you have such need.
 It is automatically registered when found in the classpath.

framework-docs/modules/ROOT/pages/languages/kotlin/resources.adoc

@@ -4,9 +4,9 @@
 We recommend the following resources for people learning how to build applications with
 Kotlin and the Spring Framework:
 
-* https://kotlinlang.org/docs/reference/[Kotlin language reference]
+* {kotlin-docs}[Kotlin language reference]
 * https://slack.kotlinlang.org/[Kotlin Slack] (with a dedicated #spring channel)
-* https://stackoverflow.com/questions/tagged/spring+kotlin[Stackoverflow, with `spring` and `kotlin` tags]
+* {stackoverflow-spring-kotlin-tags}[Stackoverflow, with `spring` and `kotlin` tags]
 * https://play.kotlinlang.org/[Try Kotlin in your browser]
 * https://blog.jetbrains.com/kotlin/[Kotlin blog]
 * https://kotlin.link/[Awesome Kotlin]
@@ -34,12 +34,12 @@ The following Github projects offer examples that you can learn from and possibl
 The following list categorizes the pending issues related to Spring and Kotlin support:
 
 * Spring Framework
-** https://github.com/spring-projects/spring-framework/issues/20606[Unable to use WebTestClient with mock server in Kotlin]
-** https://github.com/spring-projects/spring-framework/issues/20496[Support null-safety at generics, varargs and array elements level]
+** {spring-framework-issues}/20606[Unable to use WebTestClient with mock server in Kotlin]
+** {spring-framework-issues}/20496[Support null-safety at generics, varargs and array elements level]
 * Kotlin
-** https://youtrack.jetbrains.com/issue/KT-6380[Parent issue for Spring Framework support]
-** https://youtrack.jetbrains.com/issue/KT-5464[Kotlin requires type inference where Java doesn't]
-** https://youtrack.jetbrains.com/issue/KT-20283[Smart cast regression with open classes]
-** https://youtrack.jetbrains.com/issue/KT-14984[Impossible to pass not all SAM argument as function]
-** https://youtrack.jetbrains.com/issue/KT-15125[Support JSR 223 bindings directly via script variables]
-** https://youtrack.jetbrains.com/issue/KT-6653[Kotlin properties do not override Java-style getters and setters]
+** {kotlin-issues}/KT-6380[Parent issue for Spring Framework support]
+** {kotlin-issues}/KT-5464[Kotlin requires type inference where Java doesn't]
+** {kotlin-issues}/KT-20283[Smart cast regression with open classes]
+** {kotlin-issues}/KT-14984[Impossible to pass not all SAM argument as function]
+** {kotlin-issues}/KT-15125[Support JSR 223 bindings directly via script variables]
+** {kotlin-issues}/KT-6653[Kotlin properties do not override Java-style getters and setters]

framework-docs/modules/ROOT/pages/languages/kotlin/spring-projects-in.adoc

@@ -21,10 +21,10 @@ member function of Spring beans that are proxied by CGLIB, which can
 quickly become painful and is against the Kotlin principle of keeping code concise and predictable.
 
 NOTE: It is also possible to avoid CGLIB proxies for configuration classes by using `@Configuration(proxyBeanMethods = false)`.
-See {api-spring-framework}/context/annotation/Configuration.html#proxyBeanMethods--[`proxyBeanMethods` Javadoc] for more details.
+See {spring-framework-api}/context/annotation/Configuration.html#proxyBeanMethods--[`proxyBeanMethods` Javadoc] for more details.
 
 Fortunately, Kotlin provides a
-https://kotlinlang.org/docs/reference/compiler-plugins.html#kotlin-spring-compiler-plugin[`kotlin-spring`]
+{kotlin-docs}/compiler-plugins.html#kotlin-spring-compiler-plugin[`kotlin-spring`]
 plugin (a preconfigured version of the `kotlin-allopen` plugin) that automatically opens classes
 and their member functions for types that are annotated or meta-annotated with one of the following
 annotations:
@@ -59,7 +59,7 @@ within the primary constructor, as in the following example:
 	class Person(val name: String, val age: Int)
 ----
 
-You can optionally add https://kotlinlang.org/docs/reference/data-classes.html[the `data` keyword]
+You can optionally add {kotlin-docs}/data-classes.html[the `data` keyword]
 to make the compiler automatically derive the following members from all properties declared
 in the primary constructor:
 
@@ -80,12 +80,12 @@ As the following example shows, this allows for easy changes to individual prope
 
 Common persistence technologies (such as JPA) require a default constructor, preventing this
 kind of design. Fortunately, there is a workaround for this
-https://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell["`default constructor hell`"],
-since Kotlin provides a https://kotlinlang.org/docs/reference/compiler-plugins.html#kotlin-jpa-compiler-plugin[`kotlin-jpa`]
+{stackoverflow-questions}/32038177/kotlin-with-jpa-default-constructor-hell["`default constructor hell`"],
+since Kotlin provides a {kotlin-docs}/compiler-plugins.html#kotlin-jpa-compiler-plugin[`kotlin-jpa`]
 plugin that generates synthetic no-arg constructor for classes annotated with JPA annotations.
 
 If you need to leverage this kind of mechanism for other persistence technologies, you can configure
-the https://kotlinlang.org/docs/reference/compiler-plugins.html#how-to-use-no-arg-plugin[`kotlin-noarg`]
+the {kotlin-docs}/compiler-plugins.html#how-to-use-no-arg-plugin[`kotlin-noarg`]
 plugin.
 
 NOTE: As of the Kay release train, Spring Data supports Kotlin immutable class instances and
@@ -98,7 +98,7 @@ does not require the `kotlin-noarg` plugin if the module uses Spring Data object
 == Injecting Dependencies
 
 Our recommendation is to try to favor constructor injection with `val` read-only (and
-non-nullable when possible) https://kotlinlang.org/docs/reference/properties.html[properties],
+non-nullable when possible) {kotlin-docs}/properties.html[properties],
 as the following example shows:
 
 [source,kotlin,indent=0]
@@ -137,13 +137,13 @@ as the following example shows:
 
 In Java, you can inject configuration properties by using annotations (such as pass:q[`@Value("${property}")`)].
 However, in Kotlin, `$` is a reserved character that is used for
-https://kotlinlang.org/docs/reference/idioms.html#string-interpolation[string interpolation].
+{kotlin-docs}/idioms.html#string-interpolation[string interpolation].
 
 Therefore, if you wish to use the `@Value` annotation in Kotlin, you need to escape the `$`
 character by writing pass:q[`@Value("\${property}")`].
 
 NOTE: If you use Spring Boot, you should probably use
-https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-typesafe-configuration-properties[`@ConfigurationProperties`]
+{spring-boot-docs}/boot-features-external-config.html#boot-features-external-config-typesafe-configuration-properties[`@ConfigurationProperties`]
 instead of `@Value` annotations.
 
 As an alternative, you can customize the property placeholder prefix by declaring the
@@ -177,14 +177,14 @@ that uses the `${...}` syntax, with configuration beans, as the following exampl
 [[checked-exceptions]]
 == Checked Exceptions
 
-Java and https://kotlinlang.org/docs/reference/exceptions.html[Kotlin exception handling]
+Java and {kotlin-docs}/exceptions.html[Kotlin exception handling]
 are pretty close, with the main difference being that Kotlin treats all exceptions as
 unchecked exceptions. However, when using proxied objects (for example classes or methods
 annotated with `@Transactional`), checked exceptions thrown will be wrapped by default in
 an `UndeclaredThrowableException`.
 
 To get the original exception thrown like in Java, methods should be annotated with
-https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.jvm/-throws/index.html[`@Throws`]
+{kotlin-api}/jvm/stdlib/kotlin.jvm/-throws/index.html[`@Throws`]
 to specify explicitly the checked exceptions thrown (for example `@Throws(IOException::class)`).
 
 
@@ -194,7 +194,7 @@ to specify explicitly the checked exceptions thrown (for example `@Throws(IOExce
 
 Kotlin annotations are mostly similar to Java annotations, but array attributes (which are
 extensively used in Spring) behave differently. As explained in the
-https://kotlinlang.org/docs/reference/annotations.html[Kotlin documentation] you can omit
+{kotlin-docs}/annotations.html[Kotlin documentation] you can omit
 the `value` attribute name, unlike other attributes, and specify it as a `vararg` parameter.
 
 To understand what that means, consider `@RequestMapping` (which is one of the most widely
@@ -240,13 +240,13 @@ be matched, not only the `GET` method.
 == Declaration-site variance
 
 Dealing with generic types in Spring applications written in Kotlin may require, for some use cases, to understand
-Kotlin https://kotlinlang.org/docs/generics.html#declaration-site-variance[declaration-site variance]
+Kotlin {kotlin-docs}/generics.html#declaration-site-variance[declaration-site variance]
 which allows to define the variance when declaring a type, which is not possible in Java which supports only use-site
 variance.
 
 For example, declaring `List<Foo>` in Kotlin is conceptually equivalent to `java.util.List<? extends Foo>` because
 `kotlin.collections.List` is declared as
-https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/-list/[`interface List<out E> : kotlin.collections.Collection<E>`].
+{kotlin-api}/jvm/stdlib/kotlin.collections/-list/[`interface List<out E> : kotlin.collections.Collection<E>`].
 
 This needs to be taken into account by using the `out` Kotlin keyword on generic types when using Java classes,
 for example when writing a `org.springframework.core.convert.converter.Converter` from a Kotlin type to a Java type.
@@ -267,7 +267,7 @@ class ListOfAnyConverter : Converter<List<*>, CustomJavaList<*>> {
 ----
 
 NOTE: Spring Framework does not leverage yet declaration-site variance type information for injecting beans,
-subscribe to https://github.com/spring-projects/spring-framework/issues/22313[spring-framework#22313] to track related
+subscribe to {spring-framework-issues}/22313[spring-framework#22313] to track related
 progresses.
 
 
@@ -280,7 +280,7 @@ The recommended testing framework is https://junit.org/junit5/[JUnit 5] along wi
 https://mockk.io/[Mockk] for mocking.
 
 NOTE: If you are using Spring Boot, see
-https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-kotlin-testing[this related documentation].
+{spring-boot-docs}/features.html#features.kotlin.testing[this related documentation].
 
 
 [[constructor-injection]]
@@ -289,7 +289,7 @@ https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-featu
 As described in the xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-di[dedicated section],
 JUnit Jupiter (JUnit 5) allows constructor injection of beans which is pretty useful with Kotlin
 in order to use `val` instead of `lateinit var`. You can use
-{api-spring-framework}/test/context/TestConstructor.html[`@TestConstructor(autowireMode = AutowireMode.ALL)`]
+{spring-framework-api}/test/context/TestConstructor.html[`@TestConstructor(autowireMode = AutowireMode.ALL)`]
 to enable autowiring for all parameters.
 
 NOTE: You can also change the default behavior to `ALL` in a `junit-platform.properties`
@@ -383,15 +383,3 @@ class SpecificationLikeTests {
 ----
 
 
-[[kotlin-webtestclient-issue]]
-=== `WebTestClient` Type Inference Issue in Kotlin
-
-Due to a https://youtrack.jetbrains.com/issue/KT-5464[type inference issue], you must
-use the Kotlin `expectBody` extension (such as `.expectBody<String>().isEqualTo("toys")`),
-since it provides a workaround for the Kotlin issue with the Java API.
-
-See also the related https://jira.spring.io/browse/SPR-16057[SPR-16057] issue.
-
-
-
-

framework-docs/modules/ROOT/pages/languages/kotlin/web.adoc

@@ -8,9 +8,9 @@
 
 Spring Framework comes with a Kotlin router DSL available in 3 flavors:
 
-* WebMvc.fn DSL with {docs-spring-framework}/kdoc-api/spring-webmvc/org.springframework.web.servlet.function/router.html[router { }]
-* WebFlux.fn <<web-reactive#webflux-fn, Reactive>> DSL with {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.server/router.html[router { }]
-* WebFlux.fn <<Coroutines>> DSL with {docs-spring-framework}/kdoc-api/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }]
+* WebMvc.fn DSL with {spring-framework-api-kdoc}/spring-webmvc/org.springframework.web.servlet.function/router.html[router { }]
+* WebFlux.fn <<web-reactive#webflux-fn, Reactive>> DSL with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/router.html[router { }]
+* WebFlux.fn <<Coroutines>> DSL with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }]
 
 These DSL let you write clean and idiomatic Kotlin code to build a `RouterFunction` instance as the following example shows:
 
@@ -79,12 +79,12 @@ mockMvc.get("/person/{name}", "Lee") {
 == Kotlin Script Templates
 
 Spring Framework provides a
-https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/view/script/ScriptTemplateView.html[`ScriptTemplateView`]
-which supports https://www.jcp.org/en/jsr/detail?id=223[JSR-223] to render templates by using script engines.
+{spring-framework-api}/web/servlet/view/script/ScriptTemplateView.html[`ScriptTemplateView`]
+which supports {JSR}223[JSR-223] to render templates by using script engines.
 
 By leveraging `scripting-jsr223` dependencies, it
 is possible to use such feature to render Kotlin-based templates with
-https://github.com/Kotlin/kotlinx.html[kotlinx.html] DSL or Kotlin multiline interpolated `String`.
+{kotlin-github-org}/kotlinx.html[kotlinx.html] DSL or Kotlin multiline interpolated `String`.
 
 `build.gradle.kts`
 [source,kotlin,indent=0]
@@ -126,10 +126,10 @@ project for more details.
 [[kotlin-multiplatform-serialization]]
 == Kotlin multiplatform serialization
 
-As of Spring Framework 5.3, https://github.com/Kotlin/kotlinx.serialization[Kotlin multiplatform serialization] is
+As of Spring Framework 5.3, {kotlin-github-org}/kotlinx.serialization[Kotlin multiplatform serialization] is
 supported in Spring MVC, Spring WebFlux and Spring Messaging (RSocket). The builtin support currently targets CBOR, JSON, and ProtoBuf formats.
 
-To enable it, follow https://github.com/Kotlin/kotlinx.serialization#setup[those instructions] to add the related dependency and plugin.
+To enable it, follow {kotlin-github-org}/kotlinx.serialization#setup[those instructions] to add the related dependency and plugin.
 With Spring MVC and WebFlux, both Kotlin serialization and Jackson will be configured by default if they are in the classpath since
 Kotlin serialization is designed to serialize only Kotlin classes annotated with `@Serializable`.
 With Spring Messaging (RSocket), make sure that neither Jackson, GSON or JSONB are in the classpath if you want automatic configuration,

framework-docs/modules/ROOT/pages/overview.adoc

@@ -57,18 +57,18 @@ competition with Spring, they are in fact complementary. The Spring programming
 model does not embrace the Jakarta EE platform specification; rather, it integrates
 with carefully selected individual specifications from the traditional EE umbrella:
 
-* Servlet API (https://jcp.org/en/jsr/detail?id=340[JSR 340])
-* WebSocket API (https://www.jcp.org/en/jsr/detail?id=356[JSR 356])
-* Concurrency Utilities (https://www.jcp.org/en/jsr/detail?id=236[JSR 236])
-* JSON Binding API (https://jcp.org/en/jsr/detail?id=367[JSR 367])
-* Bean Validation (https://jcp.org/en/jsr/detail?id=303[JSR 303])
-* JPA (https://jcp.org/en/jsr/detail?id=338[JSR 338])
-* JMS (https://jcp.org/en/jsr/detail?id=914[JSR 914])
+* Servlet API ({JSR}340[JSR 340])
+* WebSocket API ({JSR}356[JSR 356])
+* Concurrency Utilities ({JSR}236[JSR 236])
+* JSON Binding API ({JSR}367[JSR 367])
+* Bean Validation ({JSR}303[JSR 303])
+* JPA ({JSR}338[JSR 338])
+* JMS ({JSR}914[JSR 914])
 * as well as JTA/JCA setups for transaction coordination, if necessary.
 
 The Spring Framework also supports the Dependency Injection
-(https://www.jcp.org/en/jsr/detail?id=330[JSR 330]) and Common Annotations
-(https://jcp.org/en/jsr/detail?id=250[JSR 250]) specifications, which application
+({JSR}330[JSR 330]) and Common Annotations
+({JSR}250[JSR 250]) specifications, which application
 developers may choose to use instead of the Spring-specific mechanisms provided
 by the Spring Framework. Originally, those were based on common `javax` packages.
 
@@ -89,7 +89,7 @@ and can run on servers (such as Netty) that are not Servlet containers.
 Spring continues to innovate and to evolve. Beyond the Spring Framework, there are other
 projects, such as Spring Boot, Spring Security, Spring Data, Spring Cloud, Spring Batch,
 among others. It’s important to remember that each project has its own source code repository,
-issue tracker, and release cadence. See https://spring.io/projects[spring.io/projects] for
+issue tracker, and release cadence. See {spring-site-projects}[spring.io/projects] for
 the complete list of Spring projects.
 
 
@@ -125,17 +125,17 @@ clean code structure with  no circular dependencies between packages.
 == Feedback and Contributions
 
 For how-to questions or diagnosing or debugging issues, we suggest using Stack Overflow. Click
-https://stackoverflow.com/questions/tagged/spring+or+spring-mvc+or+spring-aop+or+spring-jdbc+or+spring-r2dbc+or+spring-transactions+or+spring-annotations+or+spring-jms+or+spring-el+or+spring-test+or+spring+or+spring-orm+or+spring-jmx+or+spring-cache+or+spring-webflux+or+spring-rsocket?tab=Newest[here]
+{stackoverflow-spring-tag}+or+spring-mvc+or+spring-aop+or+spring-jdbc+or+spring-r2dbc+or+spring-transactions+or+spring-annotations+or+spring-jms+or+spring-el+or+spring-test+or+spring+or+spring-orm+or+spring-jmx+or+spring-cache+or+spring-webflux+or+spring-rsocket?tab=Newest[here]
 for a list of the suggested tags to use on Stack Overflow. If you're fairly certain that
 there is a problem in the Spring Framework or would like to suggest a feature, please use
-the https://github.com/spring-projects/spring-framework/issues[GitHub Issues].
+the {spring-framework-issues}[GitHub Issues].
 
 If you have a solution in mind or a suggested fix, you can submit a pull request on
-https://github.com/spring-projects/spring-framework[Github]. However, please keep in mind
+{spring-framework-github}[Github]. However, please keep in mind
 that, for all but the most trivial issues, we expect a ticket to be filed in the issue
 tracker, where discussions take place and leave a record for future reference.
 
-For more details see the guidelines at the {spring-framework-main-code}/CONTRIBUTING.md[CONTRIBUTING],
+For more details see the guidelines at the {spring-framework-code}/CONTRIBUTING.md[CONTRIBUTING],
 top-level project page.
 
 
@@ -145,15 +145,15 @@ top-level project page.
 == Getting Started
 
 If you are just getting started with Spring, you may want to begin using the Spring
-Framework by creating a https://projects.spring.io/spring-boot/[Spring Boot]-based
+Framework by creating a {spring-site-projects}/spring-boot/[Spring Boot]-based
 application. Spring Boot provides a quick (and opinionated) way to create a
 production-ready Spring-based application. It is based on the Spring Framework, favors
 convention over configuration, and is designed to get you up and running as quickly
 as possible.
 
 You can use https://start.spring.io/[start.spring.io] to generate a basic project or follow
-one of the https://spring.io/guides["Getting Started" guides], such as
-https://spring.io/guides/gs/rest-service/[Getting Started Building a RESTful Web Service].
+one of the {spring-site-guides}["Getting Started" guides], such as
+{spring-site-guides}/gs/rest-service/[Getting Started Building a RESTful Web Service].
 As well as being easier to digest, these guides are very task focused, and most of them
 are based on Spring Boot. They also cover other projects from the Spring portfolio that
 you might want to consider when solving a particular problem.

framework-docs/modules/ROOT/pages/rsocket.adoc

@@ -23,7 +23,7 @@ while the above interactions are called "request streams" or simply "requests".
 
 These are the key features and benefits of the RSocket protocol:
 
-* https://www.reactive-streams.org/[Reactive Streams] semantics across network boundary --
+* {reactive-streams-site}/[Reactive Streams] semantics across network boundary --
 for streaming requests such as `Request-Stream` and `Channel`, back pressure signals
 travel between requester and responder, allowing a requester to slow down a responder at
 the source, hence reducing reliance on network layer congestion control, and the need
@@ -38,9 +38,9 @@ the amount of state required.
 * Fragmentation and re-assembly of large messages.
 * Keepalive (heartbeats).
 
-RSocket has {gh-rsocket}[implementations] in multiple languages. The
-{gh-rsocket-java}[Java library] is built on https://projectreactor.io/[Project Reactor],
-and https://github.com/reactor/reactor-netty[Reactor Netty] for the transport. That means
+RSocket has {rsocket-github-org}[implementations] in multiple languages. The
+{rsocket-java}[Java library] is built on {reactor-site}/[Project Reactor],
+and {reactor-github-org}/reactor-netty[Reactor Netty] for the transport. That means
 signals from Reactive Streams Publishers in your application propagate transparently
 through RSocket across the network.
 
@@ -50,8 +50,8 @@ through RSocket across the network.
 === The Protocol
 
 One of the benefits of RSocket is that it has well defined behavior on the wire and an
-easy to read https://rsocket.io/about/protocol[specification] along with some protocol
-{gh-rsocket}/rsocket/tree/master/Extensions[extensions]. Therefore it is
+easy to read {rsocket-site}/about/protocol[specification] along with some protocol
+{rsocket-protocol-extensions}[extensions]. Therefore it is
 a good idea to read the spec, independent of language implementations and higher level
 framework APIs. This section provides a succinct overview to establish some context.
 
@@ -96,18 +96,18 @@ and therefore only included in the first message on a request, i.e. with one of
 
 Protocol extensions define common metadata formats for use in applications:
 
-* {gh-rsocket-extensions}/CompositeMetadata.md[Composite Metadata]-- multiple,
+* {rsocket-protocol-extensions}/CompositeMetadata.md[Composite Metadata]-- multiple,
   independently formatted metadata entries.
-* {gh-rsocket-extensions}/Routing.md[Routing] -- the route for a request.
+* {rsocket-protocol-extensions}/Routing.md[Routing] -- the route for a request.
 
 
 
 [[rsocket-java]]
 === Java Implementation
 
-The {gh-rsocket-java}[Java implementation] for RSocket is built on
-https://projectreactor.io/[Project Reactor]. The transports for  TCP and WebSocket are
-built on https://github.com/reactor/reactor-netty[Reactor Netty]. As a Reactive Streams
+The {rsocket-java}[Java implementation] for RSocket is built on
+{reactor-site}/[Project Reactor]. The transports for  TCP and WebSocket are
+built on {reactor-github-org}/reactor-netty[Reactor Netty]. As a Reactive Streams
 library, Reactor simplifies the job of implementing the protocol. For applications it is
 a natural fit to use `Flux` and `Mono` with declarative operators and transparent back
 pressure support.
@@ -117,7 +117,7 @@ features and leaves the application programming model (e.g. RPC codegen vs other
 higher level, independent concern.
 
 The main contract
-{gh-rsocket-java}/blob/master/rsocket-core/src/main/java/io/rsocket/RSocket.java[io.rsocket.RSocket]
+{rsocket-java-code}/rsocket-core/src/main/java/io/rsocket/RSocket.java[io.rsocket.RSocket]
 models the four request interaction types with `Mono` representing a promise for a
 single message, `Flux` a stream of messages, and `io.rsocket.Payload` the actual
 message with access to data and metadata as byte buffers. The `RSocket` contract is used
@@ -127,7 +127,7 @@ requests with. For responding, the application implements `RSocket` to handle re
 This is not meant to be a thorough introduction. For the most part, Spring applications
 will not have to use its API directly. However it may be important to see or experiment
 with RSocket independent of Spring. The RSocket Java repository contains a number of
-{gh-rsocket-java}/tree/master/rsocket-examples[sample apps] that
+{rsocket-java-code}/rsocket-examples[sample apps] that
 demonstrate its API and protocol features.
 
 
@@ -152,7 +152,7 @@ Spring Boot 2.2 supports standing up an RSocket server over TCP or WebSocket, in
 the option to expose RSocket over WebSocket in a WebFlux server. There is also client
 support and auto-configuration for an `RSocketRequester.Builder` and `RSocketStrategies`.
 See the
-https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-rsocket[RSocket section]
+{spring-boot-docs}/messaging.html#messaging.rsocket[RSocket section]
 in the Spring Boot reference for more details.
 
 Spring Security 5.2 provides RSocket support.
@@ -222,7 +222,7 @@ established transparently and used.
 
 For data, the default mime type is derived from the first configured `Decoder`. For
 metadata, the default mime type is
-{gh-rsocket-extensions}/CompositeMetadata.md[composite metadata] which allows multiple
+{rsocket-protocol-extensions}/CompositeMetadata.md[composite metadata] which allows multiple
 metadata value and mime type pairs per request. Typically both don't need to be changed.
 
 Data and metadata in the `SETUP` frame is optional. On the server side,
@@ -534,7 +534,7 @@ Kotlin::
 ======
 
 Extra metadata values can be added if using
-{gh-rsocket-extensions}/CompositeMetadata.md[composite metadata] (the default) and if the
+{rsocket-protocol-extensions}/CompositeMetadata.md[composite metadata] (the default) and if the
 values are supported by a registered `Encoder`. For example:
 
 [tabs]
@@ -663,8 +663,8 @@ Kotlin::
 ======
 
 `RSocketMessageHandler` supports
-{gh-rsocket-extensions}/CompositeMetadata.md[composite] and
-{gh-rsocket-extensions}/Routing.md[routing] metadata by default. You can set its
+{rsocket-protocol-extensions}/CompositeMetadata.md[composite] and
+{rsocket-protocol-extensions}/Routing.md[routing] metadata by default. You can set its
 xref:rsocket.adoc#rsocket-metadata-extractor[MetadataExtractor] if you need to switch to a
 different mime type or register additional metadata mime types.
 
@@ -954,7 +954,7 @@ xref:rsocket.adoc#rsocket-requester-server[Server Requester] for details.
 == MetadataExtractor
 
 Responders must interpret metadata.
-{gh-rsocket-extensions}/CompositeMetadata.md[Composite metadata] allows independently
+{rsocket-protocol-extensions}/CompositeMetadata.md[Composite metadata] allows independently
 formatted metadata values (e.g. for routing, security, tracing) each with its own mime
 type. Applications need a way to configure metadata mime types to support, and a way
 to access extracted values.
@@ -965,7 +965,7 @@ in annotated handler methods.
 
 `DefaultMetadataExtractor` can be given `Decoder` instances to decode metadata. Out of
 the box it has built-in support for
-{gh-rsocket-extensions}/Routing.md["message/x.rsocket.routing.v0"] which it decodes to
+{rsocket-protocol-extensions}/Routing.md["message/x.rsocket.routing.v0"] which it decodes to
 `String` and saves under the "route" key. For any other mime type you'll need to provide
 a `Decoder` and register the mime type as follows:
 

framework-docs/modules/ROOT/pages/testing/annotations/integration-junit-jupiter.adoc

@@ -82,7 +82,7 @@ Kotlin::
 
 
 See xref:testing/testcontext-framework/ctx-management.adoc[Context Management] as well as the javadoc for
-{api-spring-framework}/test/context/junit/jupiter/SpringJUnitConfig.html[`@SpringJUnitConfig`]
+{spring-framework-api}/test/context/junit/jupiter/SpringJUnitConfig.html[`@SpringJUnitConfig`]
 and `@ContextConfiguration` for further details.
 
 [[integration-testing-annotations-junit-jupiter-springjunitwebconfig]]
@@ -157,9 +157,9 @@ Kotlin::
 
 
 See xref:testing/testcontext-framework/ctx-management.adoc[Context Management] as well as the javadoc for
-{api-spring-framework}/test/context/junit/jupiter/web/SpringJUnitWebConfig.html[`@SpringJUnitWebConfig`],
-{api-spring-framework}/test/context/ContextConfiguration.html[`@ContextConfiguration`], and
-{api-spring-framework}/test/context/web/WebAppConfiguration.html[`@WebAppConfiguration`]
+{spring-framework-api}/test/context/junit/jupiter/web/SpringJUnitWebConfig.html[`@SpringJUnitWebConfig`],
+{spring-framework-api}/test/context/ContextConfiguration.html[`@ContextConfiguration`], and
+{spring-framework-api}/test/context/web/WebAppConfiguration.html[`@WebAppConfiguration`]
 for further details.
 
 [[integration-testing-annotations-testconstructor]]

framework-docs/modules/ROOT/pages/testing/annotations/integration-meta.adoc

@@ -305,5 +305,5 @@ Kotlin::
 ======
 
 For further details, see the
-https://github.com/spring-projects/spring-framework/wiki/Spring-Annotation-Programming-Model[Spring Annotation Programming Model]
+{spring-framework-wiki}/Spring-Annotation-Programming-Model[Spring Annotation Programming Model]
 wiki page.

framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-activeprofiles.adoc

@@ -74,6 +74,6 @@ and registering it by using the `resolver` attribute of `@ActiveProfiles`.
 
 See xref:testing/testcontext-framework/ctx-management/env-profiles.adoc[Context Configuration with Environment Profiles],
 xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration], and the
-{api-spring-framework}/test/context/ActiveProfiles.html[`@ActiveProfiles`] javadoc for
+{spring-framework-api}/test/context/ActiveProfiles.html[`@ActiveProfiles`] javadoc for
 examples and further details.
 

framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextcustomizerfactories.adoc

@@ -40,6 +40,6 @@ Kotlin::
 By default, `@ContextCustomizerFactories` provides support for inheriting factories from
 superclasses or enclosing classes. See
 xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration] and the
-{api-spring-framework}/test/context/ContextCustomizerFactories.html[`@ContextCustomizerFactories`
+{spring-framework-api}/test/context/ContextCustomizerFactories.html[`@ContextCustomizerFactories`
 javadoc] for an example and further details.
 

framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contexthierarchy.adoc

@@ -70,6 +70,6 @@ If you need to merge or override the configuration for a given level of the cont
 hierarchy within a test class hierarchy, you must explicitly name that level by supplying
 the same value to the `name` attribute in `@ContextConfiguration` at each corresponding
 level in the class hierarchy. See xref:testing/testcontext-framework/ctx-management/hierarchies.adoc[Context Hierarchies] and the
-{api-spring-framework}/test/context/ContextHierarchy.html[`@ContextHierarchy`] javadoc
+{spring-framework-api}/test/context/ContextHierarchy.html[`@ContextHierarchy`] javadoc
 for further examples.