You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ni...@apache.org on 2020/10/12 13:21:04 UTC
[activemq-artemis] branch master updated: NO-JIRA Split
commons.dbcp2.version
This is an automated email from the ASF dual-hosted git repository.
nigrofranz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 50f7efc NO-JIRA Split commons.dbcp2.version
new a59f81d This closes #3298
50f7efc is described below
commit 50f7efcfbe9a67975c6be032d4d8e7969c4f12a0
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Mon Oct 12 15:17:45 2020 +0200
NO-JIRA Split commons.dbcp2.version
---
artemis-features/src/main/resources/features.xml | 2 +-
pom.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index a67cfb5..a6e031a 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -73,7 +73,7 @@
<bundle dependency="true">mvn:org.jctools/jctools-core/${jctools.version}</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/${commons.dbcp2.version}</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-pool2/${commons.dbcp2.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-pool2/${commons.pool2.version}</bundle>
<!-- Micrometer can't be included until it supports OSGi. It is currently an "optional" Maven dependency. -->
<!--bundle dependency="true">mvn:io.micrometer/micrometer-core/${version.micrometer}</bundle-->
diff --git a/pom.xml b/pom.xml
index a55c46e..543c264 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@
<apache.derby.version>10.11.1.1</apache.derby.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.dbcp2.version>2.7.0</commons.dbcp2.version>
+ <commons.pool2.version>2.7.0</commons.pool2.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.text.version>1.8</commons.text.version>
<fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
@@ -759,7 +760,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>${commons.dbcp2.version}</version>
+ <version>${commons.pool2.version}</version>
<!-- license Apache 2 -->
<scope>runtime</scope>
</dependency>