From a4c333e5de1f5227c30d016a109af93edec213a5 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@paluch.biz>
Date: Sat, 11 Jan 2020 11:32:12 +0100
Subject: [PATCH] Polishing #227

Strip jedis- from jedis-commons-pool2.version property.
---
 pom.xml                                | 4 ++--
 src/main/assembly/module-thorntail.xml | 2 +-
 src/main/assembly/module.xml           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b5be6654..2f0965d28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <mockito.version>3.0.0</mockito.version>
         <jackson.version>2.9.10.1</jackson.version>
         <jedis.version>3.2.0</jedis.version>
-        <jedis-commons-pool2.version>2.7.0</jedis-commons-pool2.version>
+        <commons-pool2.version>2.7.0</commons-pool2.version>
         <slf4j-api.version>1.7.25</slf4j-api.version>
         <logback-classic.version>1.1.3</logback-classic.version>
         <org.jboss.logmanager.version>1.5.2.Final</org.jboss.logmanager.version>
@@ -408,7 +408,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>${jedis-commons-pool2.version}</version>
+            <version>${commons-pool2.version}</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/src/main/assembly/module-thorntail.xml b/src/main/assembly/module-thorntail.xml
index 643a1dfa6..bc14ba567 100644
--- a/src/main/assembly/module-thorntail.xml
+++ b/src/main/assembly/module-thorntail.xml
@@ -4,7 +4,7 @@
     <resources>
         <artifact name="${project.groupId}:${project.artifactId}:${project.version}" />
         <artifact name="redis.clients:jedis:${jedis.version}" />
-        <artifact name="org.apache.commons:commons-pool2:${jedis-commons-pool2.version}" />
+        <artifact name="org.apache.commons:commons-pool2:${commons-pool2.version}" />
     </resources>
 
     <dependencies>
diff --git a/src/main/assembly/module.xml b/src/main/assembly/module.xml
index f52fd8937..ee212c88e 100644
--- a/src/main/assembly/module.xml
+++ b/src/main/assembly/module.xml
@@ -4,7 +4,7 @@
     <resources>
         <resource-root path="${project.artifactId}-${project.version}.jar" />
         <resource-root path="jedis-${jedis.version}.jar" />
-        <resource-root path="commons-pool2-${jedis-commons-pool2.version}.jar" />
+        <resource-root path="commons-pool2-${commons-pool2.version}.jar" />
     </resources>
 
     <dependencies>