Merge branch '3.4.x' into 3.5.x

Closes gh-47859

Author: wilkinsona

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

@@ -97,6 +97,9 @@ private void configureDokkatoo(Project project) {
 					link.getPackageListUrl().set(URI.create(url + "/element-list"));
 				});
 			}
+			else {
+				sourceSet.getSuppress().set(true);
+			}
 		});
 	}
 

spring-boot-project/spring-boot-docs/build.gradle

@@ -17,10 +17,10 @@
 import org.springframework.boot.build.docs.ConfigureJavadocLinks
 
 plugins {
+	id "org.jetbrains.kotlin.jvm"
 	id "dev.adamko.dokkatoo-html"
 	id "java"
 	id "org.antora"
-	id "org.jetbrains.kotlin.jvm"
 	id "org.springframework.boot.aggregator"
 	id "org.springframework.boot.antora-contributor"
 	id "org.springframework.boot.antora-dependencies"

spring-boot-project/spring-boot-test/build.gradle

@@ -15,9 +15,9 @@
  */
 
 plugins {
+	id "org.jetbrains.kotlin.jvm"
 	id "dev.adamko.dokkatoo-html"
 	id "java-library"
-	id "org.jetbrains.kotlin.jvm"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"
 }

spring-boot-project/spring-boot/build.gradle

@@ -15,13 +15,13 @@
  */
 
 plugins {
-	id "dev.adamko.dokkatoo-html"
-	id "java-library"
-	id "java-test-fixtures"
 	id "org.jetbrains.kotlin.jvm"
+	id "dev.adamko.dokkatoo-html"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"
+	id "java-library"
+	id "java-test-fixtures"
 }
 
 description = "Spring Boot"