[activemq] 05/06: Drop enable-activemq-jdbc-store.patch
Markus Koschany
apo at moszumanska.debian.org
Tue Apr 24 11:55:00 BST 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository activemq.
commit baa86ed40de0f072a8162ffba9517c17e3f8ac6c
Author: Markus Koschany <apo at debian.org>
Date: Tue Apr 24 12:44:45 2018 +0200
Drop enable-activemq-jdbc-store.patch
---
debian/patches/enable-activemq-jdbc-store.patch | 61 -------------------------
debian/patches/series | 1 -
2 files changed, 62 deletions(-)
diff --git a/debian/patches/enable-activemq-jdbc-store.patch b/debian/patches/enable-activemq-jdbc-store.patch
deleted file mode 100644
index 06355f4..0000000
--- a/debian/patches/enable-activemq-jdbc-store.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Enable activemq-jdbc-store module
-Author: Michail Bachmann <m.bachmann at cms.hu-berlin.de>
-
- * Enable activemq-jdbc-store module
- * Add optional dependencies on commons-pool and commons-dbcp
- * Fix commons-pool2.jar symlink
-
----
---- activemq-5.14.3.orig/activemq-jdbc-store/pom.xml
-+++ activemq-5.14.3/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 -->
---- activemq-5.14.3.orig/pom.xml
-+++ activemq-5.14.3/pom.xml
-@@ -53,10 +53,12 @@
- <commons-beanutils-version>1.9.2</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.5</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.5</commons-net-version>
-@@ -865,6 +867,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>
diff --git a/debian/patches/series b/debian/patches/series
index 4d9a0a1..6a549fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ init-debian-default-values.patch
activemq-spring.patch
activemq-client-jar.patch
disable-broker-test-dependency.patch
-enable-activemq-jdbc-store.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git
More information about the pkg-java-commits
mailing list