Commit 35653cc3 authored by Markus Koschany's avatar Markus Koschany

Rebase enable-activemq-jdbc-store-module.patch

parent f9a3992f
......@@ -9,7 +9,7 @@ Forwarded: no
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index b7b7d39..14292e0 100644
index ebf1ab2..b08357f 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -26,7 +26,7 @@
......
......@@ -10,7 +10,7 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 4ddb06c..f406272 100644
index d79ccea..01eafef 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -52,13 +52,13 @@
......
From: Markus Koschany <apo@debian.org>
Date: Tue, 18 Sep 2018 21:04:19 +0200
Subject: enable-activemq-jdbc-store-module
---
activemq-jdbc-store/pom.xml | 10 ++++++++++
pom.xml | 14 ++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 606b8d9..f8fabc3 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -49,6 +49,16 @@
<artifactId>activeio-core</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- =============================== -->
<!-- Testing Dependencies -->
diff --git a/pom.xml b/pom.xml
index d34113a..4df6f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,10 +53,12 @@
<commons-beanutils-version>1.9.3</commons-beanutils-version>
<commons-collections-version>3.2.2</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.1</commons-dbcp2-version>
<commons-io-version>2.6</commons-io-version>
<commons-lang-version>2.6</commons-lang-version>
<commons-logging-version>1.2</commons-logging-version>
+ <commons-pool-version>1.6</commons-pool-version>
<commons-pool2-version>2.4.2</commons-pool2-version>
<commons-primitives-version>1.0</commons-primitives-version>
<commons-net-version>3.6</commons-net-version>
@@ -862,6 +864,18 @@
<version>${commons-pool2-version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>${commons-dbcp-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons-pool-version}</version>
+ </dependency>
+
<!-- Optional Journal Implementation -->
<!--
<dependency>
......@@ -9,7 +9,7 @@ Forwarded: not-needed
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 1468aa9..059d6a6 100755
index 358204b..3a7d329 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -101,12 +101,12 @@ getActiveMQHome(){
......
......@@ -2,3 +2,4 @@ init-debian-default-values.patch
activemq-spring.patch
activemq-client-jar.patch
disable-broker-test-dependency.patch
enable-activemq-jdbc-store-module.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment