[activemq] 06/06: Rebase enable-activemq-jdbc-store-module.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 fa2155a4dad4a623c8e458b531cd9cd8d8ec0068
Author: Markus Koschany <apo at debian.org>
Date: Tue Apr 24 12:45:45 2018 +0200
Rebase enable-activemq-jdbc-store-module.patch
---
debian/patches/activemq-client-jar.patch | 2 +-
debian/patches/activemq-spring.patch | 19 +++---
.../patches/disable-broker-test-dependency.patch | 2 +-
.../enable-activemq-jdbc-store-module.patch | 69 ++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 83 insertions(+), 10 deletions(-)
diff --git a/debian/patches/activemq-client-jar.patch b/debian/patches/activemq-client-jar.patch
index 5c76a4e..f0e74fd 100644
--- a/debian/patches/activemq-client-jar.patch
+++ b/debian/patches/activemq-client-jar.patch
@@ -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 cc1e9f1..ff1b2cb 100755
+index b7b7d39..14292e0 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -26,7 +26,7 @@
diff --git a/debian/patches/activemq-spring.patch b/debian/patches/activemq-spring.patch
index 2c7f5cf..3369e49 100644
--- a/debian/patches/activemq-spring.patch
+++ b/debian/patches/activemq-spring.patch
@@ -5,14 +5,15 @@ Subject: activemq-spring
Fix FTBFS with Debian's version of Spring.
Forwarded: not-needed
---
- .../org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java | 6 +++---
.../org/apache/activemq/pool/PooledConnectionFactoryBean.java | 9 ++++-----
.../org/apache/activemq/store/PersistenceAdapterFactoryBean.java | 5 ++---
- 3 files changed, 9 insertions(+), 11 deletions(-)
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+diff --git a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java
+index 6a9de11..54dd496 100644
--- a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java
+++ b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.jms.ConnectionFactory;
import javax.transaction.TransactionManager;
@@ -21,7 +22,7 @@ Forwarded: not-needed
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.FactoryBean;
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ public class PooledConnectionFactoryBean implements FactoryBean {
private static final Logger LOGGER = LoggerFactory.getLogger(PooledConnectionFactoryBean.class);
@@ -30,7 +31,7 @@ Forwarded: not-needed
private ConnectionFactory connectionFactory;
private int maxConnections = 1;
private int maximumActive = 500;
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ public class PooledConnectionFactoryBean implements FactoryBean {
* @org.apache.xbean.InitMethod
*/
public void afterPropertiesSet() throws Exception {
@@ -39,7 +40,7 @@ Forwarded: not-needed
try {
LOGGER.debug("Trying to build a JcaPooledConnectionFactory");
JcaPooledConnectionFactory f = new JcaPooledConnectionFactory();
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ public class PooledConnectionFactoryBean implements FactoryBean {
}
if (pooledConnectionFactory == null) {
throw new IllegalStateException("Unable to create pooled connection factory. Enable DEBUG log level for more informations");
@@ -48,7 +49,7 @@ Forwarded: not-needed
}
/**
-@@ -180,7 +180,6 @@
+@@ -180,7 +180,6 @@ public class PooledConnectionFactoryBean implements FactoryBean {
*/
public void destroy() throws Exception {
if (pooledConnectionFactory != null) {
@@ -56,6 +57,8 @@ Forwarded: not-needed
pooledConnectionFactory = null;
}
}
+diff --git a/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
+index 0964024..431ae92 100644
--- a/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
+++ b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
@@ -16,7 +16,7 @@
@@ -67,7 +70,7 @@ Forwarded: not-needed
import org.springframework.beans.factory.FactoryBean;
/**
-@@ -26,13 +26,12 @@
+@@ -26,13 +26,12 @@ import org.springframework.beans.factory.FactoryBean;
*
*
*/
diff --git a/debian/patches/disable-broker-test-dependency.patch b/debian/patches/disable-broker-test-dependency.patch
index ca4f122..3574512 100644
--- a/debian/patches/disable-broker-test-dependency.patch
+++ b/debian/patches/disable-broker-test-dependency.patch
@@ -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 0a7b225..85505ec 100755
+index 4ddb06c..f406272 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -52,13 +52,13 @@
diff --git a/debian/patches/enable-activemq-jdbc-store-module.patch b/debian/patches/enable-activemq-jdbc-store-module.patch
new file mode 100644
index 0000000..448a417
--- /dev/null
+++ b/debian/patches/enable-activemq-jdbc-store-module.patch
@@ -0,0 +1,69 @@
+From: Michail Bachmann <michail.bachmann at cms.hu-berlin.de>
+Date: Tue, 24 Apr 2018 12:45:18 +0200
+Subject: enable activemq jdbc store module
+
+commons-dbcp2 is not available in Debian, so fallback to commons-dbcp.
+
+Bug-Debian: https://bugs.debian.org/895028
+---
+ 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 c0390d7..30ade33 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 db96209..9320b94 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.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.6</commons-net-version>
+@@ -861,6 +863,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 6a549fd..a27cec5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
--
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