diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
index 6bea6e4b9ac..168929fe2b6 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
@@ -82,6 +82,7 @@ public class FlywayEndpointTests {
 	@Configuration
 	public static class BaselinedFlywayConfig {
 
+		@SuppressWarnings("deprecation")
 		@Bean
 		public FlywayMigrationStrategy baseliningMigrationStrategy() {
 			return (flyway) -> {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index b8d329e3d89..0a6ba394e7d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -78,6 +78,7 @@ import org.springframework.util.StringUtils;
  * @author Dominic Gunn
  * @since 1.1.0
  */
+@SuppressWarnings("deprecation")
 @Configuration
 @ConditionalOnClass(Flyway.class)
 @ConditionalOnBean(DataSource.class)
@@ -98,7 +99,6 @@ public class FlywayAutoConfiguration {
 		return new FlywaySchemaManagementProvider(flyways);
 	}
 
-	@SuppressWarnings("deprecation")
 	@Configuration
 	@ConditionalOnMissingBean(Flyway.class)
 	@EnableConfigurationProperties({ DataSourceProperties.class, FlywayProperties.class })
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywaySchemaManagementProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywaySchemaManagementProvider.java
index 47a75ca5de8..09b72d4b9d3 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywaySchemaManagementProvider.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywaySchemaManagementProvider.java
@@ -42,7 +42,8 @@ class FlywaySchemaManagementProvider implements SchemaManagementProvider {
 	@Override
 	public SchemaManagement getSchemaManagement(DataSource dataSource) {
 		return StreamSupport.stream(this.flywayInstances.spliterator(), false)
-				.map(Flyway::getDataSource).filter(dataSource::equals).findFirst()
+				.map((flyway) -> flyway.getConfiguration().getDataSource())
+				.filter(dataSource::equals).findFirst()
 				.map((managedDataSource) -> SchemaManagement.MANAGED)
 				.orElse(SchemaManagement.UNMANAGED);
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
index 91d754ce4a7..850e49cbd6c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
@@ -50,7 +50,6 @@ public class InfluxDbAutoConfiguration {
 
 	private final OkHttpClient.Builder builder;
 
-	@SuppressWarnings("deprecation")
 	public InfluxDbAutoConfiguration(InfluxDbProperties properties,
 			ObjectProvider<InfluxDbOkHttpClientBuilderProvider> builder,
 			ObjectProvider<OkHttpClient.Builder> deprecatedBuilder) {
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java
index aec175db2cf..a1858fc580f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java
@@ -132,9 +132,9 @@ public class FlywayPropertiesTests {
 				"dryRunOutputAsFileName", "errorHandlers", "errorHandlersAsClassNames",
 				"errorOverrides", "licenseKey", "oracleSqlplus", "stream",
 				"undoSqlMigrationPrefix");
-		List<String> configurationKeys = new ArrayList(configuration.keySet());
+		List<String> configurationKeys = new ArrayList<>(configuration.keySet());
 		Collections.sort(configurationKeys);
-		List<String> propertiesKeys = new ArrayList(properties.keySet());
+		List<String> propertiesKeys = new ArrayList<>(properties.keySet());
 		Collections.sort(propertiesKeys);
 		assertThat(configurationKeys).isEqualTo(propertiesKeys);
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java
index c807c3ba724..f6e11332415 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java
@@ -171,6 +171,7 @@ public class DeferredLogTests {
 		verifyZeroInteractions(log2);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void switchTo() {
 		DirectFieldAccessor deferredLogFieldAccessor = new DirectFieldAccessor(
diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
index 249780c0c88..cb9a56d4f5c 100644
--- a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
@@ -34,7 +34,7 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -112,7 +112,7 @@ public class SampleMethodSecurityApplicationTests {
 
 	@Test
 	public void testManagementAuthorizedAccess() {
-		BasicAuthorizationInterceptor basicAuthInterceptor = new BasicAuthorizationInterceptor(
+		BasicAuthenticationInterceptor basicAuthInterceptor = new BasicAuthenticationInterceptor(
 				"admin", "admin");
 		this.restTemplate.getRestTemplate().getInterceptors().add(basicAuthInterceptor);
 		try {