Merge branch '1.5.x'

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java

@@ -37,7 +37,6 @@ import org.springframework.boot.actuate.endpoint.HealthEndpoint;
 import org.springframework.boot.actuate.endpoint.InfoEndpoint;
 import org.springframework.boot.actuate.endpoint.LiquibaseEndpoint;
 import org.springframework.boot.actuate.endpoint.LoggersEndpoint;
-import org.springframework.boot.actuate.endpoint.LoggersEndpoint.LoggerLevels;
 import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
 import org.springframework.boot.actuate.endpoint.PublicMetrics;
 import org.springframework.boot.actuate.endpoint.RequestMappingEndpoint;
@@ -131,9 +130,7 @@ public class EndpointAutoConfigurationTests {
 		load(CustomLoggingConfig.class, EndpointAutoConfiguration.class);
 		LoggersEndpoint endpoint = this.context.getBean(LoggersEndpoint.class);
 		Map<String, Object> result = endpoint.invoke();
-		Map<String, LoggerLevels> loggers = (Map<String, LoggerLevels>) result
-				.get("loggers");
-		assertThat(loggers.size()).isGreaterThan(0);
+		assertThat((Map<?, ?>) result.get("loggers")).size().isGreaterThan(0);
 	}
 
 	@Test

spring-boot-samples/spring-boot-sample-data-neo4j/src/main/java/sample/data/neo4j/CustomerRepository.java

@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.springframework.data.neo4j.repository.GraphRepository;
 
-@SuppressWarnings("deprecation")
 public interface CustomerRepository extends GraphRepository<Customer> {
 
 	public Customer findByFirstName(String firstName);

spring-boot-samples/spring-boot-sample-data-neo4j/src/main/java/sample/data/neo4j/SampleNeo4jApplication.java

@@ -27,7 +27,6 @@ public class SampleNeo4jApplication implements CommandLineRunner {
 	@Autowired
 	private CustomerRepository repository;
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void run(String... args) throws Exception {
 		this.repository.deleteAll();