From ec73144240c576ee362271690918cbcdb55be31b Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 28 Nov 2016 15:31:49 -0800
Subject: [PATCH] Fix warnings

---
 spring-boot-autoconfigure/pom.xml                |  1 -
 .../jdbc/DataSourceAutoConfiguration.java        |  1 +
 .../jdbc/DataSourceConfiguration.java            | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 8b5e369d585..c44e64d2a2d 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -613,7 +613,6 @@
 		<dependency>
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka-test</artifactId>
-			<version>${spring-kafka.version}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
index f3d1217b59e..db55e96ba26 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -103,6 +103,7 @@ public class DataSourceAutoConfiguration {
 	@Import({ DataSourceConfiguration.Tomcat.class, DataSourceConfiguration.Hikari.class,
 			DataSourceConfiguration.Dbcp.class, DataSourceConfiguration.Dbcp2.class,
 			DataSourceConfiguration.Generic.class })
+	@SuppressWarnings("deprecation")
 	protected static class PooledDataSourceConfiguration {
 
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
index 72e51ed7334..2143c09a4f1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java
@@ -42,6 +42,9 @@ abstract class DataSourceConfiguration {
 		return (T) properties.initializeDataSourceBuilder().type(type).build();
 	}
 
+	/**
+	 * Tomcat Pool DataSource configuration.
+	 */
 	@ConditionalOnClass(org.apache.tomcat.jdbc.pool.DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.tomcat.jdbc.pool.DataSource", matchIfMissing = true)
 	static class Tomcat extends DataSourceConfiguration {
@@ -64,6 +67,9 @@ abstract class DataSourceConfiguration {
 
 	}
 
+	/**
+	 * Hikari DataSource configuration.
+	 */
 	@ConditionalOnClass(HikariDataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "com.zaxxer.hikari.HikariDataSource", matchIfMissing = true)
 	static class Hikari extends DataSourceConfiguration {
@@ -75,6 +81,10 @@ abstract class DataSourceConfiguration {
 		}
 	}
 
+	/**
+	 * DBCP DataSource configuration.
+	 * @deprecated as of Spring Boot 1.5 in favor of DBCP2
+	 */
 	@ConditionalOnClass(org.apache.commons.dbcp.BasicDataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.commons.dbcp.BasicDataSource", matchIfMissing = true)
 	@Deprecated
@@ -97,6 +107,9 @@ abstract class DataSourceConfiguration {
 		}
 	}
 
+	/**
+	 * DBCP DataSource configuration.
+	 */
 	@ConditionalOnClass(org.apache.commons.dbcp2.BasicDataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type", havingValue = "org.apache.commons.dbcp2.BasicDataSource", matchIfMissing = true)
 	static class Dbcp2 extends DataSourceConfiguration {
@@ -110,6 +123,9 @@ abstract class DataSourceConfiguration {
 		}
 	}
 
+	/**
+	 * Generic DataSource configuration.
+	 */
 	@ConditionalOnMissingBean(DataSource.class)
 	@ConditionalOnProperty(name = "spring.datasource.type")
 	static class Generic {