Merge branch '2.1.x' into 2.2.x

Closes gh-21082
2020-04-22 11:58:39 -07:00
parent 6bf933205c b3d33754a5
commit 102729b5e1
4 changed files with 4 additions and 14 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java
@@ -55,7 +55,6 @@ class HikariDataSourceConfigurationTests {
 					assertThat(ds.getJdbcUrl()).isEqualTo("jdbc:foo//bar/spam");
 					assertThat(ds.getMaxLifetime()).isEqualTo(1234);
 				});
-		// TODO: test JDBC4 isValid()
 	}

 	@Test