Merge branch '2.1.x'

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

@@ -49,7 +49,6 @@ public class CassandraAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@SuppressWarnings("deprecation")
 	public Cluster cassandraCluster(CassandraProperties properties,
 			ObjectProvider<ClusterBuilderCustomizer> builderCustomizers) {
 		PropertyMapper map = PropertyMapper.get();

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 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.
@@ -113,7 +113,6 @@ protected boolean isUseDefaultFilters() {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	protected Set<Class<?>> getDefaultIncludes() {
 		if (ObjectUtils.isEmpty(this.annotation.controllers())) {
 			return DEFAULT_INCLUDES_AND_CONTROLLER;

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/CloudPlatformTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 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.
@@ -92,7 +92,7 @@ public void getActiveWhenHasServiceHostAndServicePortShouldReturnKubernetes() {
 		Map<String, Object> source = new HashMap<>();
 		source.put("EXAMPLE_SERVICE_HOST", "---");
 		source.put("EXAMPLE_SERVICE_PORT", "8080");
-		PropertySource propertySource = new SystemEnvironmentPropertySource(
+		PropertySource<?> propertySource = new SystemEnvironmentPropertySource(
 				StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, source);
 		environment.getPropertySources().addFirst(propertySource);
 		CloudPlatform platform = CloudPlatform.getActive(environment);
@@ -103,7 +103,7 @@ public void getActiveWhenHasServiceHostAndServicePortShouldReturnKubernetes() {
 	@Test
 	public void getActiveWhenHasServiceHostAndNoServicePortShouldNotReturnKubernetes() {
 		MockEnvironment environment = new MockEnvironment();
-		PropertySource propertySource = new SystemEnvironmentPropertySource(
+		PropertySource<?> propertySource = new SystemEnvironmentPropertySource(
 				StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
 				Collections.singletonMap("EXAMPLE_SERVICE_HOST", "---"));
 		environment.getPropertySources().addFirst(propertySource);