From 7b5ac46ac717005667f63d0a04e95914f64e5bc2 Mon Sep 17 00:00:00 2001
From: Peter Rinehart <peter.rinehart@hitachivantara.com>
Date: Tue, 30 Jan 2024 14:51:26 -0500
Subject: [PATCH] [BACKLOG-39797] Updating properties of
 org.pentaho.di.core.database.util.DecryptingDataSource to match
 org.apache.commons.dbcp2.BasicDataSource after dbcp2 library update.

---
 .../system/applicationContext-spring-security-jdbc.properties | 2 +-
 .../system/applicationContext-spring-security-jdbc.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.properties b/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.properties
index cc8fe2d76b0..19e9ed4d3c0 100644
--- a/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.properties
+++ b/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.properties
@@ -25,7 +25,7 @@ datasource.validation.query=SELECT 1 FROM INFORMATION_SCHEMA.SYSTEM_USERS
 # for a connection to be returned before throwing an exception, or <= 0 to wait indefinitely. Default value is -1
 datasource.pool.max.wait=-1
 
-# The maximum number of active connections that can be allocated from this pool at the same time, or negative for no limit. Default value is 8
+# The maximum number of connections that can be allocated from this pool at the same time, or negative for no limit. Default value is 8
 datasource.pool.max.active=8
  
 # The maximum number of connections that can remain idle in the pool, without extra ones being destroyed, or negative for no limit. Default value is 8
diff --git a/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.xml b/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.xml
index 51130d78660..b38cc816332 100644
--- a/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.xml
+++ b/assemblies/pentaho-solutions/src/main/resources/pentaho-solutions/system/applicationContext-spring-security-jdbc.xml
@@ -58,8 +58,8 @@
 		<property name="password" value="${datasource.password}" />
 		<!-- the following are optional -->
 		<property name="validationQuery" value="${datasource.validation.query}" />
-		<property name="maxWait" value="${datasource.pool.max.wait}" />
-		<property name="maxActive" value="${datasource.pool.max.active}" />
+		<property name="maxWaitMillis" value="${datasource.pool.max.wait}" />
+		<property name="maxTotal" value="${datasource.pool.max.active}" />
 		<property name="maxIdle" value="${datasource.max.idle}" />
 		<property name="minIdle" value="${datasource.min.idle}" />
 	</bean>