From 4d932bc787ffaa4b8a79b44366b5ec80f58b9dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 22 Nov 2021 16:07:50 +0100
Subject: [PATCH] [OPENJPA-2889] Align commons-pool2 bundle version in Karaf
 features repository with the actual one

---
 openjpa-features/src/main/feature/feature.xml | 2 +-
 pom.xml                                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openjpa-features/src/main/feature/feature.xml b/openjpa-features/src/main/feature/feature.xml
index d32e459a6..fa9834d82 100644
--- a/openjpa-features/src/main/feature/feature.xml
+++ b/openjpa-features/src/main/feature/feature.xml
@@ -24,7 +24,7 @@
         <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-el_1.0_spec/1.0.1</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.6.0</bundle>
+	<bundle dependency="true">mvn:org.apache.commons/commons-pool2/${pool2.version}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/2.7.0</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1</bundle>
         <bundle dependency="true">mvn:org.apache.xbean/xbean-asm9-shaded/${xbean.version}</bundle>
diff --git a/pom.xml b/pom.xml
index 9fe698699..5685d7db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
         <jmock.version>2.9.0</jmock.version>
         <automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>
         <dbcp2.version>2.8.0</dbcp2.version>
+	<pool2.version>2.9.0</pool2.version>
     </properties>
 
     <licenses>
@@ -1725,7 +1726,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>2.9.0</version>
+		<version>${pool2.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>