diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f7a809db8d..5bd10861e1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -179,7 +179,7 @@ bom { ] } } - library("Commons DBCP2", "2.9.0") { + library("Commons DBCP2", "2.10.0") { group("org.apache.commons") { modules = [ "commons-dbcp2" { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java index 75d4ac1a55..72c9420a98 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/metadata/CommonsDbcp2DataSourcePoolMetadataTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.jdbc.metadata; +import java.time.Duration; + import org.apache.commons.dbcp2.BasicDataSource; import org.junit.jupiter.api.Test; @@ -83,7 +85,7 @@ class CommonsDbcp2DataSourcePoolMetadataTests BasicDataSource dataSource = createDataSource(); dataSource.setMinIdle(minSize); dataSource.setMaxTotal(maxSize); - dataSource.setMinEvictableIdleTimeMillis(5000); + dataSource.setMinEvictableIdle(Duration.ofSeconds(5)); return new CommonsDbcp2DataSourcePoolMetadata(dataSource); }