Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-5636 - Update DBCP to a much more recent version

This commit is contained in:
Jeff Genender 2015-03-05 08:36:26 -07:00
parent ab28b771e3
commit 58ed95d7c8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-unit-tests/pom.xml
View File

@ -244,9 +244,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1</version>
<optional>true</optional>
<scope>test</scope>
</dependency>

4
assembly/pom.xml
View File

@ -223,8 +223,8 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<optional>true</optional>
</dependency>
<dependency>

2
assembly/src/main/descriptors/common-bin.xml
View File

@ -172,7 +172,7 @@
<include>${pom.groupId}:activeio-core</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
<include>commons-dbcp:commons-dbcp</include>
<include>org.apache.commons:commons-dbcp2</include>
<include>commons-pool:commons-pool</include>
<include>commons-codec:commons-codec</include>
<include>commons-net:commons-net</include>

8
pom.xml
View File

@ -53,7 +53,7 @@
<commons-beanutils-version>1.8.3</commons-beanutils-version>
<commons-collections-version>3.2.1</commons-collections-version>
<commons-daemon-version>1.0.15</commons-daemon-version>
<commons-dbcp-version>1.4</commons-dbcp-version>
<commons-dbcp2-version>2.1</commons-dbcp2-version>
<commons-io-version>2.4</commons-io-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-logging-version>1.1.3</commons-logging-version>
@ -848,9 +848,9 @@
-->
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons-dbcp-version}</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>${commons-dbcp2-version}</version>
</dependency>
<dependency>