Merge branch 'spring-projects:main' into main

.gitignore

@@ -53,3 +53,4 @@ atlassian-ide-plugin.xml
 cached-antora-playbook.yml
 
 node_modules
+/.kotlin/

build.gradle

@@ -89,7 +89,7 @@ configure([rootProject] + javaProjects) { project ->
 
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
-			"https://jakarta.ee/specifications/platform/9/apidocs/",
+			"https://jakarta.ee/specifications/platform/11/apidocs/",
 			"https://docs.jboss.org/hibernate/orm/5.6/javadocs/",
 			"https://eclipse.dev/aspectj/doc/released/aspectj5rt-api",
 			"https://www.quartz-scheduler.org/api/2.3.0/",

buildSrc/README.md

@@ -11,6 +11,16 @@ The `org.springframework.build.conventions` plugin applies all conventions to th
 * Configuring the Kotlin compiler, see `KotlinConventions`
 * Configuring testing in the build with `TestConventions` 
 
+This plugin also provides a DSL extension to optionally enable Java preview features for
+compiling and testing sources in a module. This can be applied with the following in a
+module build file:
+
+```groovy
+springFramework {
+	enableJavaPreviewFeatures = true
+}
+```
+
 
 ## Build Plugins
 

buildSrc/build.gradle

@@ -20,7 +20,6 @@ ext {
 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 "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"

buildSrc/src/main/java/org/springframework/build/ConventionsPlugin.java

@@ -36,6 +36,7 @@ public class ConventionsPlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
+		project.getExtensions().create("springFramework", SpringFrameworkExtension.class);
 		new CheckstyleConventions().apply(project);
 		new JavaConventions().apply(project);
 		new KotlinConventions().apply(project);

buildSrc/src/main/java/org/springframework/build/JavaConventions.java

@@ -75,19 +75,25 @@ private void applyJavaCompileConventions(Project project) {
 			toolchain.getVendor().set(JvmVendorSpec.BELLSOFT);
 			toolchain.getLanguageVersion().set(JavaLanguageVersion.of(17));
 		});
-		project.getTasks().withType(JavaCompile.class)
-				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
-				.forEach(compileTask -> {
-					compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
-					compileTask.getOptions().setEncoding("UTF-8");
-				});
-		project.getTasks().withType(JavaCompile.class)
-				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
-						|| compileTask.getName().equals("compileTestFixturesJava"))
-				.forEach(compileTask -> {
-					compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
-					compileTask.getOptions().setEncoding("UTF-8");
-				});
+		SpringFrameworkExtension frameworkExtension = project.getExtensions().getByType(SpringFrameworkExtension.class);
+		project.afterEvaluate(p -> {
+			p.getTasks().withType(JavaCompile.class)
+					.matching(compileTask -> compileTask.getName().startsWith(JavaPlugin.COMPILE_JAVA_TASK_NAME))
+					.forEach(compileTask -> {
+						compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
+						compileTask.getOptions().getCompilerArgumentProviders().add(frameworkExtension.asArgumentProvider());
+						compileTask.getOptions().setEncoding("UTF-8");
+					});
+			p.getTasks().withType(JavaCompile.class)
+					.matching(compileTask -> compileTask.getName().startsWith(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
+							|| compileTask.getName().equals("compileTestFixturesJava"))
+					.forEach(compileTask -> {
+						compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
+						compileTask.getOptions().getCompilerArgumentProviders().add(frameworkExtension.asArgumentProvider());
+						compileTask.getOptions().setEncoding("UTF-8");
+					});
+
+		});
 	}
 
 }

buildSrc/src/main/java/org/springframework/build/KotlinConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -16,15 +16,14 @@
 
 package org.springframework.build;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.gradle.api.Project;
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions;
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget;
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
 
 /**
  * @author Brian Clozel
+ * @author Sebastien Deleuze
  */
 public class KotlinConventions {
 
@@ -34,15 +33,14 @@ void apply(Project project) {
 	}
 
 	private void configure(KotlinCompile compile) {
-		KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
-		kotlinOptions.setApiVersion("1.7");
-		kotlinOptions.setLanguageVersion("1.7");
-		kotlinOptions.setJvmTarget("17");
-		kotlinOptions.setJavaParameters(true);
-		kotlinOptions.setAllWarningsAsErrors(true);
-		List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs());
-		freeCompilerArgs.addAll(List.of("-Xsuppress-version-warnings", "-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn"));
-		compile.getKotlinOptions().setFreeCompilerArgs(freeCompilerArgs);
+		compile.compilerOptions(options -> {
+			options.getApiVersion().set(KotlinVersion.KOTLIN_2_1);
+			options.getLanguageVersion().set(KotlinVersion.KOTLIN_2_1);
+			options.getJvmTarget().set(JvmTarget.JVM_17);
+			options.getJavaParameters().set(true);
+			options.getAllWarningsAsErrors().set(true);
+			options.getFreeCompilerArgs().addAll("-Xsuppress-version-warnings", "-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn");
+		});
 	}
 
 }

buildSrc/src/main/java/org/springframework/build/SpringFrameworkExtension.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2024 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;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.gradle.api.Project;
+import org.gradle.api.provider.Property;
+import org.gradle.process.CommandLineArgumentProvider;
+
+public class SpringFrameworkExtension {
+
+	private final Property<Boolean> enableJavaPreviewFeatures;
+
+	public SpringFrameworkExtension(Project project) {
+		this.enableJavaPreviewFeatures = project.getObjects().property(Boolean.class);
+	}
+
+	public Property<Boolean> getEnableJavaPreviewFeatures() {
+		return this.enableJavaPreviewFeatures;
+	}
+
+	public CommandLineArgumentProvider asArgumentProvider() {
+		return () -> {
+			if (getEnableJavaPreviewFeatures().getOrElse(false)) {
+				return List.of("--enable-preview");
+			}
+			return Collections.emptyList();
+		};
+	}
+}

buildSrc/src/main/java/org/springframework/build/TestConventions.java

@@ -67,6 +67,8 @@ private void configureTests(Project project, Test test) {
 				"--add-opens=java.base/java.util=ALL-UNNAMED",
 				"-Xshare:off"
 		);
+		test.getJvmArgumentProviders().add(project.getExtensions()
+				.getByType(SpringFrameworkExtension.class).asArgumentProvider());
 	}
 
 	private void configureTestRetryPlugin(Project project, Test test) {

framework-docs/framework-docs.gradle

@@ -41,6 +41,13 @@ repositories {
 	}
 }
 
+// To avoid a redeclaration error with Kotlin compiler
+sourceSets {
+	main {
+		java.exclude("org/springframework/docs/**/*.java")
+	}
+}
+
 dependencies {
 	api(project(":spring-aspects"))
 	api(project(":spring-context"))
@@ -68,6 +75,7 @@ dependencies {
 	api("org.aspectj:aspectjweaver")
 	api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
 	api("org.jetbrains.kotlin:kotlin-stdlib")
+	api("jakarta.websocket:jakarta.websocket-api")
 
 	implementation(project(":spring-core-test"))
 	implementation("org.assertj:assertj-core")

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

@@ -674,9 +674,7 @@ By default, the `AnnotationBeanNameGenerator` is used. For Spring
 xref:core/beans/classpath-scanning.adoc#beans-stereotype-annotations[stereotype annotations],
 if you supply a name via the annotation's `value` attribute that name will be used as
 the name in the corresponding bean definition. This convention also applies when the
-following JSR-250 and JSR-330 annotations are used instead of Spring stereotype
-annotations: `@jakarta.annotation.ManagedBean`, `@javax.annotation.ManagedBean`,
-`@jakarta.inject.Named`, and `@javax.inject.Named`.
+`@jakarta.inject.Named` annotation is used instead of Spring stereotype annotations.
 
 As of Spring Framework 6.1, the name of the annotation attribute that is used to specify
 the bean name is no longer required to be `value`. Custom stereotype annotations can

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

@@ -11,9 +11,7 @@ Spring Framework's email support:
 * The https://jakartaee.github.io/mail-api/[Jakarta Mail] library
 
 This library is freely available on the web -- for example, in Maven Central as
-`com.sun.mail:jakarta.mail`. Please make sure to use the latest 2.x version (which uses
-the `jakarta.mail` package namespace) rather than Jakarta Mail 1.6.x (which uses the
-`javax.mail` package namespace).
+`org.eclipse.angus:angus-mail`.
 ****
 
 The Spring Framework provides a helpful utility library for sending email that shields

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

@@ -2,7 +2,7 @@
 = Requirements
 :page-section-summary-toc: 1
 
-Spring Framework supports Kotlin 1.7+ and requires
+Spring Framework supports Kotlin 2.1+ and requires
 https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib[`kotlin-stdlib`]
 and https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-reflect[`kotlin-reflect`]
 to be present on the classpath. They are provided by default if you bootstrap a Kotlin project on

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

@@ -75,54 +75,6 @@ mockMvc.get("/person/{name}", "Lee") {
 
 
 
-[[kotlin-script-templates]]
-== Kotlin Script Templates
-
-Spring Framework provides a
-{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
-{kotlin-github-org}/kotlinx.html[kotlinx.html] DSL or Kotlin multiline interpolated `String`.
-
-`build.gradle.kts`
-[source,kotlin,indent=0]
-----
-dependencies {
-        runtime("org.jetbrains.kotlin:kotlin-scripting-jsr223:${kotlinVersion}")
-}
-----
-
-Configuration is usually done with `ScriptTemplateConfigurer` and `ScriptTemplateViewResolver` beans.
-
-`KotlinScriptConfiguration.kt`
-[source,kotlin,indent=0]
-----
-@Configuration
-class KotlinScriptConfiguration {
-
-    @Bean
-	fun kotlinScriptConfigurer() = ScriptTemplateConfigurer().apply {
-		engineName = "kotlin"
-		setScripts("scripts/render.kts")
-		renderFunction = "render"
-		isSharedEngine = false
-	}
-
-    @Bean
-    fun kotlinScriptViewResolver() = ScriptTemplateViewResolver().apply {
-        setPrefix("templates/")
-        setSuffix(".kts")
-    }
-}
-----
-
-See the https://github.com/sdeleuze/kotlin-script-templating[kotlin-script-templating] example
-project for more details.
-
-
-
 [[kotlin-multiplatform-serialization]]
 == Kotlin multiplatform serialization
 

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

@@ -171,9 +171,9 @@ the parameters of a test class constructor are autowired from components in the
 
 If `@TestConstructor` is not present or meta-present on a test class, the default _test
 constructor autowire mode_ will be used. See the tip below for details on how to change
-the default mode. Note, however, that a local declaration of `@Autowired`,
-`@jakarta.inject.Inject`, or `@javax.inject.Inject` on a constructor takes precedence
-over both `@TestConstructor` and the default mode.
+the default mode. Note, however, that a local declaration of `@Autowired` or
+`@jakarta.inject.Inject` on a constructor takes precedence over both `@TestConstructor`
+and the default mode.
 
 .Changing the default test constructor autowire mode
 [TIP]

framework-docs/modules/ROOT/pages/web/webflux-view.adoc

@@ -466,7 +466,7 @@ Java::
 ----
 	@GetMapping
 	FragmentsRendering handle() {
-		return FragmentsRendering.with("posts").fragment("comments").build();
+		return FragmentsRendering.fragment("posts").fragment("comments").build();
 	}
 ----
 
@@ -476,7 +476,7 @@ Kotlin::
 ----
 	@GetMapping
 	fun handle(): FragmentsRendering {
-		return FragmentsRendering.with("posts").fragment("comments").build()
+		return FragmentsRendering.fragment("posts").fragment("comments").build()
 	}
 ----
 ======

framework-docs/modules/ROOT/pages/web/webflux/config.adoc

@@ -647,13 +647,12 @@ For https://www.webjars.org/documentation[WebJars], versioned URLs like
 `/webjars/jquery/1.2.0/jquery.min.js` are the recommended and most efficient way to use them.
 The related resource location is configured out of the box with Spring Boot (or can be configured
 manually via `ResourceHandlerRegistry`) and does not require to add the
-`org.webjars:webjars-locator-core` dependency.
+`org.webjars:webjars-locator-lite` dependency.
 
 Version-less URLs like `/webjars/jquery/jquery.min.js` are supported through the
 `WebJarsResourceResolver` which is automatically registered when the
-`org.webjars:webjars-locator-core` library is present on the classpath, at the cost of a
-classpath scanning that could slow down application startup. The resolver can re-write URLs to
-include the version of the jar and can also match against incoming URLs without versions
+`org.webjars:webjars-locator-lite` library is present on the classpath. The resolver can re-write
+URLs to include the version of the jar and can also match against incoming URLs without versions
 -- for example, from `/webjars/jquery/jquery.min.js` to `/webjars/jquery/1.2.0/jquery.min.js`.
 
 TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-fragments.adoc

@@ -48,7 +48,7 @@ Java::
 ----
 	@GetMapping
 	FragmentsRendering handle() {
-		return FragmentsRendering.with("posts").fragment("comments").build();
+		return FragmentsRendering.fragment("posts").fragment("comments").build();
 	}
 ----
 
@@ -58,7 +58,7 @@ Kotlin::
 ----
 	@GetMapping
 	fun handle(): FragmentsRendering {
-		return FragmentsRendering.with("posts").fragment("comments").build()
+		return FragmentsRendering.fragment("posts").fragment("comments").build()
 	}
 ----
 ======

framework-docs/modules/ROOT/pages/web/webmvc/filters.adoc

@@ -30,7 +30,7 @@ available through the `ServletRequest.getParameter{asterisk}()` family of method
 
 
 
-[[forwarded-headers]]
+[[filters-forwarded-headers]]
 == Forwarded Headers
 [.small]#xref:web/webflux/reactive-spring.adoc#webflux-forwarded-headers[See equivalent in the Reactive stack]#
 

framework-docs/modules/ROOT/pages/web/webmvc/mvc-config/static-resources.adoc

@@ -48,13 +48,12 @@ For https://www.webjars.org/documentation[WebJars], versioned URLs like
 `/webjars/jquery/1.2.0/jquery.min.js` are the recommended and most efficient way to use them.
 The related resource location is configured out of the box with Spring Boot (or can be configured
 manually via `ResourceHandlerRegistry`) and does not require to add the
-`org.webjars:webjars-locator-core` dependency.
+`org.webjars:webjars-locator-lite` dependency.
 
 Version-less URLs like `/webjars/jquery/jquery.min.js` are supported through the
 `WebJarsResourceResolver` which is automatically registered when the
-`org.webjars:webjars-locator-core` library is present on the classpath, at the cost of a
-classpath scanning that could slow down application startup. The resolver can re-write URLs to
-include the version of the jar and can also match against incoming URLs without versions
+`org.webjars:webjars-locator-lite` library is present on the classpath. The resolver can re-write
+URLs to include the version of the jar and can also match against incoming URLs without versions
 -- for example, from `/webjars/jquery/jquery.min.js` to `/webjars/jquery/1.2.0/jquery.min.js`.
 
 TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options