Merge branch '3.4.x' into 3.5.x

Closes gh-47438

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfiguration.java

@@ -127,7 +127,7 @@ DefaultConfiguration jooqConfiguration(JooqProperties properties, ConnectionProv
 
 	@Bean
 	@ConditionalOnProperty("spring.jooq.config")
-	@ConditionalOnMissingBean(Settings.class)
+	@ConditionalOnMissingBean
 	Settings settings(JooqProperties properties) throws IOException {
 		if (!ClassUtils.isPresent("jakarta.xml.bind.JAXBContext", null)) {
 			throw new JaxbNotAvailableException();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializerTests.java

@@ -62,8 +62,8 @@ void getSettingsWithPlatformDoesNotTouchDataSource() {
 	}
 
 	@ParameterizedTest
-	@EnumSource(mode = Mode.EXCLUDE, names = { "AWS_WRAPPER", "CLICKHOUSE", "FIREBIRD",
-			"INFORMIX", "JTDS", "PHOENIX", "REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" })
+	@EnumSource(mode = Mode.EXCLUDE, names = { "AWS_WRAPPER", "CLICKHOUSE", "FIREBIRD", "INFORMIX", "JTDS", "PHOENIX",
+			"REDSHIFT", "TERADATA", "TESTCONTAINERS", "UNKNOWN" })
 	void batchSchemaCanBeLocated(DatabaseDriver driver) throws SQLException {
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
 		BatchProperties properties = new BatchProperties();