From a491c30aed514bef8ff39895cd8b715a534f7976 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Fri, 29 Dec 2023 11:43:47 -0500
Subject: [PATCH] Add pom variable for dbcp2 (#5574)

---
 pom.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed1ecd0457e..9c188328297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -919,6 +919,15 @@
 		<maven_changes_version>2.12.1</maven_changes_version>
 		<commons_codec_version>1.15</commons_codec_version>
 		<commons_compress_version>1.21</commons_compress_version>
+		<!--
+		Note if you bump the version here - The commons-dbcp2 2.11.0 version
+		explicitly depends on commons-pool2 2.12.0, so we explicitly specify that
+		version below as well. If you bump this, make sure you're bumping the
+		pool2 version appropriately too.
+		-->
+		<commons_dbcp2_version>2.11.0</commons_dbcp2_version>
+		<!-- Before Bumping: See note above about dbcp2 -->
+		<commons_pool2_version>2.12.0</commons_pool2_version>
 		<commons_text_version>1.10.0</commons_text_version>
 		<commons_io_version>2.11.0</commons_io_version>
 		<commons_lang3_version>3.12.0</commons_lang3_version>
@@ -1439,7 +1448,7 @@
 				-->
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-dbcp2</artifactId>
-				<version>2.11.0</version>
+				<version>${commons_dbcp2_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
@@ -1450,7 +1459,7 @@
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-pool2</artifactId>
 				<!-- See the note above about commons-dbcp2 before bumping versions here -->
-				<version>2.12.0</version>
+				<version>${commons_pool2_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>