From 200b299ff4a63e3b9c7c056aaa0149c711d315dc Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Fri, 17 Apr 2026 14:11:20 +0000
Subject: [PATCH] Upgrade commons-pool 1.x to commons-pool2 2.12.0

- Replace commons-pool:commons-pool:1.6 with org.apache.commons:commons-pool2:2.12.0 in root pom.xml dependency management
- Update dependency reference in admin/broadleaf-open-admin-platform/pom.xml
- Migrate GenericObjectPool import from org.apache.commons.pool.impl to org.apache.commons.pool2.impl in SandBoxConnection.java

Co-Authored-By: Arjun Mishra <arjunsaxmishra@gmail.com>
---
 admin/broadleaf-open-admin-platform/pom.xml                 | 4 ++--
 .../service/persistence/datasource/SandBoxConnection.java   | 2 +-
 pom.xml                                                     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/broadleaf-open-admin-platform/pom.xml b/admin/broadleaf-open-admin-platform/pom.xml
index be9f7b147e..c35ea08005 100644
--- a/admin/broadleaf-open-admin-platform/pom.xml
+++ b/admin/broadleaf-open-admin-platform/pom.xml
@@ -157,8 +157,8 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
diff --git a/admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/datasource/SandBoxConnection.java b/admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/datasource/SandBoxConnection.java
index 0fad9e620c..137e5ca8c0 100644
--- a/admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/datasource/SandBoxConnection.java
+++ b/admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/datasource/SandBoxConnection.java
@@ -17,7 +17,7 @@
  */
 package org.broadleafcommerce.openadmin.server.service.persistence.datasource;
 
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.springframework.util.Assert;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/pom.xml b/pom.xml
index 6836d3b269..4e833f8756 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1386,9 +1386,9 @@
 
             <!--Persistence Libraries -->
             <dependency>
-                <groupId>commons-pool</groupId>
-                <artifactId>commons-pool</artifactId>
-                <version>1.6</version>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-pool2</artifactId>
+                <version>2.12.0</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>