diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
index 1e2cbca3108..2c1c2989722 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -267,8 +267,8 @@ class DataSourceAutoConfigurationTests {
 			DataSource dataSource = context.getBean(DataSource.class);
 			assertThat(dataSource).asInstanceOf(InstanceOfAssertFactories.type(BasicDataSource.class))
 				.satisfies((dbcp2) -> {
-					assertThat(dbcp2.getUsername()).isEqualTo("user-1");
-					assertThat(dbcp2.getPassword()).isEqualTo("password-1");
+					assertThat(dbcp2.getUserName()).isEqualTo("user-1");
+					assertThat(dbcp2).extracting("password").isEqualTo("password-1");
 					assertThat(dbcp2.getDriverClassName()).isEqualTo(DatabaseDriver.POSTGRESQL.getDriverClassName());
 					assertThat(dbcp2.getUrl()).isEqualTo("jdbc:customdb://customdb.example.com:12345/database-1");
 				});
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/Dbcp2JdbcConnectionDetailsBeanPostProcessorTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/Dbcp2JdbcConnectionDetailsBeanPostProcessorTests.java
index fd3aef26ad3..cbabcf054d4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/Dbcp2JdbcConnectionDetailsBeanPostProcessorTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/Dbcp2JdbcConnectionDetailsBeanPostProcessorTests.java
@@ -42,8 +42,8 @@ class Dbcp2JdbcConnectionDetailsBeanPostProcessorTests {
 		new Dbcp2JdbcConnectionDetailsBeanPostProcessor(null).processDataSource(dataSource,
 				new TestJdbcConnectionDetails());
 		assertThat(dataSource.getUrl()).isEqualTo("jdbc:customdb://customdb.example.com:12345/database-1");
-		assertThat(dataSource.getUsername()).isEqualTo("user-1");
-		assertThat(dataSource.getPassword()).isEqualTo("password-1");
+		assertThat(dataSource.getUserName()).isEqualTo("user-1");
+		assertThat(dataSource).extracting("password").isEqualTo("password-1");
 		assertThat(dataSource.getDriverClassName()).isEqualTo(DatabaseDriver.POSTGRESQL.getDriverClassName());
 	}
 
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 5f5f11704a1..60e63dfbb22 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -177,7 +177,7 @@ bom {
 			]
 		}
 	}
-	library("Commons DBCP2", "2.10.0") {
+	library("Commons DBCP2", "2.11.0") {
 		group("org.apache.commons") {
 			modules = [
 				"commons-dbcp2" {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
index 60cc940a840..65ce19cdec7 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
@@ -644,8 +644,8 @@ public final class DataSourceBuilder<T extends DataSource> {
 			add(DataSourceProperty.URL, BasicDataSource::getUrl, BasicDataSource::setUrl);
 			add(DataSourceProperty.DRIVER_CLASS_NAME, BasicDataSource::getDriverClassName,
 					BasicDataSource::setDriverClassName);
-			add(DataSourceProperty.USERNAME, BasicDataSource::getUsername, BasicDataSource::setUsername);
-			add(DataSourceProperty.PASSWORD, BasicDataSource::getPassword, BasicDataSource::setPassword);
+			add(DataSourceProperty.USERNAME, BasicDataSource::getUserName, BasicDataSource::setUsername);
+			add(DataSourceProperty.PASSWORD, null, BasicDataSource::setPassword);
 		}
 
 	}