Merge branch '2.1.x' into 2.2.x

Closes gh-20117

Author: snicoll

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -104,10 +104,10 @@ void whenMultipleLiquibaseBeansArePresentChangeSetsAreCorrectlyReportedForEachBe
 							.liquibaseBeans().getContexts().get(context.getId()).getLiquibaseBeans();
 					assertThat(liquibaseBeans.get("liquibase").getChangeSets()).hasSize(1);
 					assertThat(liquibaseBeans.get("liquibase").getChangeSets().get(0).getChangeLog())
-							.isEqualTo("classpath:db/changelog/db.changelog-master.yaml");
+							.isEqualTo("classpath:/db/changelog/db.changelog-master.yaml");
 					assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets()).hasSize(1);
 					assertThat(liquibaseBeans.get("liquibaseBackup").getChangeSets().get(0).getChangeLog())
-							.isEqualTo("classpath:db/changelog/db.changelog-master-backup.yaml");
+							.isEqualTo("classpath:/db/changelog/db.changelog-master-backup.yaml");
 				});
 	}
 
@@ -157,7 +157,7 @@ private DataSource createEmbeddedDatabase() {
 
 		private SpringLiquibase createSpringLiquibase(String changeLog, DataSource dataSource) {
 			SpringLiquibase liquibase = new SpringLiquibase();
-			liquibase.setChangeLog("classpath:db/changelog/" + changeLog);
+			liquibase.setChangeLog("classpath:/db/changelog/" + changeLog);
 			liquibase.setShouldRun(true);
 			liquibase.setDataSource(dataSource);
 			return liquibase;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -36,7 +36,7 @@ public class LiquibaseProperties {
 	/**
 	 * Change log configuration path.
 	 */
-	private String changeLog = "classpath:db/changelog/db.changelog-master.yaml";
+	private String changeLog = "classpath:/db/changelog/db.changelog-master.yaml";
 
 	/**
 	 * Comma-separated list of runtime contexts to use.

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1043,7 +1043,7 @@
       "name": "liquibase.change-log",
       "type": "java.lang.String",
       "description": "Change log configuration path.",
-      "defaultValue": "classpath:db/changelog/db.changelog-master.yaml",
+      "defaultValue": "classpath:/db/changelog/db.changelog-master.yaml",
       "deprecation": {
         "replacement": "spring.liquibase.change-log",
         "level": "error"

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -102,7 +102,7 @@ void createsDataSourceWithNoDataSourceBeanAndLiquibaseUrl() {
 	void defaultSpringLiquibase() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 				.run(assertLiquibase((liquibase) -> {
-					assertThat(liquibase.getChangeLog()).isEqualTo("classpath:db/changelog/db.changelog-master.yaml");
+					assertThat(liquibase.getChangeLog()).isEqualTo("classpath:/db/changelog/db.changelog-master.yaml");
 					assertThat(liquibase.getContexts()).isNull();
 					assertThat(liquibase.getDefaultSchema()).isNull();
 					assertThat(liquibase.isDropFirst()).isFalse();
@@ -112,26 +112,26 @@ void defaultSpringLiquibase() {
 	@Test
 	void changelogXml() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.xml")
+				.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.xml")
 				.run(assertLiquibase((liquibase) -> assertThat(liquibase.getChangeLog())
-						.isEqualTo("classpath:db/changelog/db.changelog-override.xml")));
+						.isEqualTo("classpath:/db/changelog/db.changelog-override.xml")));
 	}
 
 	@Test
 	void changelogJson() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.json")
+				.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.json")
 				.run(assertLiquibase((liquibase) -> assertThat(liquibase.getChangeLog())
-						.isEqualTo("classpath:db/changelog/db.changelog-override.json")));
+						.isEqualTo("classpath:/db/changelog/db.changelog-override.json")));
 	}
 
 	@Test
 	@EnabledOnJre(JRE.JAVA_8)
 	void changelogSql() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues("spring.liquibase.change-log:classpath:db/changelog/db.changelog-override.sql")
+				.withPropertyValues("spring.liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql")
 				.run(assertLiquibase((liquibase) -> assertThat(liquibase.getChangeLog())
-						.isEqualTo("classpath:db/changelog/db.changelog-override.sql")));
+						.isEqualTo("classpath:/db/changelog/db.changelog-override.sql")));
 	}
 
 	@Test
@@ -374,7 +374,7 @@ static class LiquibaseUserConfiguration {
 		@Bean
 		SpringLiquibase springLiquibase(DataSource dataSource) {
 			SpringLiquibase liquibase = new SpringLiquibase();
-			liquibase.setChangeLog("classpath:db/changelog/db.changelog-master.yaml");
+			liquibase.setChangeLog("classpath:/db/changelog/db.changelog-master.yaml");
 			liquibase.setShouldRun(true);
 			liquibase.setDataSource(dataSource);
 			return liquibase;

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-liquibase/src/test/java/smoketest/liquibase/SampleLiquibaseApplicationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -59,10 +59,10 @@ void testDefaultSettings(CapturedOutput output) throws Exception {
 		assertThat(output).contains("Successfully acquired change log lock")
 				.contains("Creating database history table with name: PUBLIC.DATABASECHANGELOG")
 				.contains("Table person created")
-				.contains("ChangeSet classpath:db/changelog/db.changelog-master.yaml::1::"
+				.contains("ChangeSet classpath:/db/changelog/db.changelog-master.yaml::1::"
 						+ "marceloverdijk ran successfully")
 				.contains("New row inserted into person")
-				.contains("ChangeSet classpath:db/changelog/"
+				.contains("ChangeSet classpath:/db/changelog/"
 						+ "db.changelog-master.yaml::2::marceloverdijk ran successfully")
 				.contains("Successfully released change log lock");
 	}