Commit 2f7a7634 authored by Markus Koschany's avatar Markus Koschany

Refresh patches

parent 9e414e31
......@@ -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 f949e35..7d3c1de 100644
index 096c4d3..5023e4d 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 d6008ef..014a7b7 100644
index a3af28d..190074b 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -52,13 +52,13 @@
......
From: Markus Koschany <apo@debian.org>
Date: Thu, 29 Aug 2019 23:09:34 +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 ab344d8..88a4f08 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -54,6 +54,16 @@
<artifactId>jaxb-impl</artifactId>
<version>2.2.5</version>
</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>
<!-- =============================== -->
diff --git a/pom.xml b/pom.xml
index eb73b1e..5943950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,10 +53,12 @@
<commons-beanutils-version>1.9.4</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.6.0</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.6.2</commons-pool2-version>
<commons-primitives-version>1.0</commons-primitives-version>
<commons-net-version>3.6</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>
From: Markus Koschany <apo@debian.org>
Date: Thu, 29 Aug 2019 23:07:36 +0200
Subject: java11
Build-Depend on jaxb-impl and javax API because these classes have been
removed in Java 11.
---
activemq-client/pom.xml | 5 +++++
activemq-jdbc-store/pom.xml | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 5023e4d..9829137 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -79,6 +79,11 @@
<artifactId>jmdns</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
<!-- =============================== -->
<!-- Testing Dependencies -->
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 90c3a52..ab344d8 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -49,6 +49,12 @@
<artifactId>activeio-core</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.5</version>
+ </dependency>
+
<!-- =============================== -->
<!-- Testing Dependencies -->
From: Markus Koschany <apo@debian.org>
Date: Thu, 29 Aug 2019 23:08:33 +0200
Subject: maven-xbean-plugin
debian/maven.rules does not work. See also #907477
---
activemq-spring/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 9b85367..f002482 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -211,7 +211,7 @@
<plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
- <version>3.12</version>
+ <version>4.5</version>
<executions>
<execution>
<phase>process-classes</phase>
diff --git a/pom.xml b/pom.xml
index 9701a44..eb73b1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
<xmlresolver-bundle-version>1.2_5</xmlresolver-bundle-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.11.1</xstream-version>
- <xbean-version>4.14</xbean-version>
+ <xbean-version>4.5</xbean-version>
<xerces-version>2.12.0</xerces-version>
<jaxb-basics-version>0.6.4</jaxb-basics-version>
<stompjms-version>1.19</stompjms-version>
......@@ -2,3 +2,6 @@ init-debian-default-values.patch
activemq-spring.patch
activemq-client-jar.patch
disable-broker-test-dependency.patch
java11.patch
maven-xbean-plugin.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