Merge branch '2.1.x'

Closes gh-18298

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzDataSourceInitializerTests.java

@@ -65,8 +65,8 @@ class QuartzDataSourceInitializerTests {
 	@Test
 	void commentPrefixCanBeCustomized() {
 		this.contextRunner.withUserConfiguration(TestConfiguration.class).withPropertyValues(
-				"spring.quartz.jdbc.comment-prefix=##",
-				"spring.quartz.jdbc.schema=classpath:org/springframework/boot/autoconfigure/quartz/tables_@@platform@@.sql")
+				"spring.quartz.jdbc.comment-prefix=**",
+				"spring.quartz.jdbc.schema=classpath:org/springframework/boot/autoconfigure/quartz/tables_**_comments.sql")
 				.run(this::assertThatDataSourceHasBeenInitialized);
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/quartz/tables_h2.sql → spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/quartz/tables_**_comments.sql

-## This is a test script to check custom comment prefix is taken into account
+** This is a test script to check ** is treated as a comment prefix when prefix is customized
 
 CREATE TABLE QRTZ_TEST_TABLE (
   SCHED_NAME VARCHAR(120) NOT NULL,
   CALENDAR_NAME VARCHAR (200) NOT NULL
 );
 
-## Another comment
+** Another comment
 
 COMMIT;