Merge branch '3.2.x' into 3.3.x

Closes spring-projectsgh-41982

Author: wilkinsona

buildSrc/build.gradle

@@ -40,7 +40,6 @@ dependencies {
 	checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 
 	implementation(platform("org.springframework:spring-framework-bom:${versions.springFramework}"))
-	implementation("com.diffplug.gradle:goomph:3.37.2")
 	implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1")
 	implementation("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}")
 	implementation("com.github.node-gradle:gradle-node-plugin:3.5.1")

buildSrc/src/main/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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.
@@ -33,7 +33,6 @@
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
-import org.springframework.boot.build.processors.ProcessedAnnotationsPlugin;
 import org.springframework.util.StringUtils;
 
 /**
@@ -92,7 +91,6 @@ private void configureConfigurationPropertiesAnnotationProcessor(Project project
 			.add(project.getDependencies()
 				.project(Collections.singletonMap("path",
 						":spring-boot-project:spring-boot-tools:spring-boot-configuration-processor")));
-		project.getPlugins().apply(ProcessedAnnotationsPlugin.class);
 	}
 
 	private void disableIncrementalCompilation(Project project) {