activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From artnas...@apache.org
Subject [1/5] activemq git commit: AMQ-5636 - Update DBCP to a much more recent version
Date Fri, 06 Mar 2015 17:36:49 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 24c2215f4 -> dd35e357e


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


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/58ed95d7
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/58ed95d7
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/58ed95d7

Branch: refs/heads/master
Commit: 58ed95d7c8c60a439f205a13eb5906ef1b199d9f
Parents: ab28b77
Author: Jeff Genender <jgenender@savoirtech.com>
Authored: Thu Mar 5 08:36:26 2015 -0700
Committer: Jeff Genender <jgenender@savoirtech.com>
Committed: Thu Mar 5 08:36:26 2015 -0700

----------------------------------------------------------------------
 activemq-unit-tests/pom.xml                  | 6 +++---
 assembly/pom.xml                             | 4 ++--
 assembly/src/main/descriptors/common-bin.xml | 2 +-
 pom.xml                                      | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/58ed95d7/activemq-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index d6af0b2..4d0d9e9 100755
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/58ed95d7/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c01c702..3428aae 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/58ed95d7/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 4ff62a9..efbd9f2 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>

http://git-wip-us.apache.org/repos/asf/activemq/blob/58ed95d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4d6cdcd..31e582b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>


Mime
View raw message