This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository activemq.
commit 48b6204132c49799a83088e9a42f80a4c52ad6cc Author: Markus Koschany <[email protected]> Date: Tue Apr 24 12:38:11 2018 +0200 Enable activemq-jdbc-store module. Add optional dependencies on commons-pool and commons-dbcp. Fix commons-pool2.jar symlink. Thanks: Michail Bachmann for the report and patch. Closes: #895028 --- debian/activemq.links | 4 +- debian/control | 2 + debian/libactivemq-java.README.Debian | 1 - debian/libactivemq-java.poms | 2 +- debian/maven.ignoreRules | 1 - debian/patches/enable-activemq-jdbc-store.patch | 61 +++++++++++++++++++++++++ debian/patches/series | 1 + 7 files changed, 68 insertions(+), 4 deletions(-) diff --git a/debian/activemq.links b/debian/activemq.links index fd8111c..c08b01f 100644 --- a/debian/activemq.links +++ b/debian/activemq.links @@ -4,6 +4,7 @@ /usr/share/java/activemq-console.jar /usr/share/activemq/lib/activemq-console.jar /usr/share/java/activemq-jaas.jar /usr/share/activemq/lib/activemq-jaas.jar /usr/share/java/activemq-kahadb-store.jar /usr/share/activemq/lib/activemq-kahadb-store.jar +/usr/share/java/activemq-jdbc-store.jar /usr/share/activemq/lib/activemq-jdbc-store.jar /usr/share/java/activemq-mqtt.jar /usr/share/activemq/lib/activemq-mqtt.jar /usr/share/java/activemq-openwire-legacy.jar /usr/share/activemq/lib/activemq-openwire-legacy.jar /usr/share/java/activemq-protobuf.jar /usr/share/activemq/lib/activemq-protobuf.jar @@ -18,7 +19,8 @@ /usr/share/java/commons-httpclient.jar /usr/share/activemq/lib/optional/commons-httpclient.jar /usr/share/java/commons-lang.jar /usr/share/activemq/lib/optional/commons-lang.jar /usr/share/java/commons-net.jar /usr/share/activemq/lib/optional/commons-net.jar -/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2jar +/usr/share/java/commons-pool.jar /usr/share/activemq/lib/optional/commons-pool.jar +/usr/share/java/commons-pool2.jar /usr/share/activemq/lib/optional/commons-pool2.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/activemq/lib/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/geronimo-j2ee-management-1.1-spec.jar /usr/share/activemq/lib/geronimo-j2ee-management-1.1-spec.jar /usr/share/java/geronimo-jacc_1.1_spec.jar /usr/share/activemq/lib/geronimo-jacc_1.1_spec.jar diff --git a/debian/control b/debian/control index 812e4a5..283bccc 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,8 @@ Build-Depends: libcommons-beanutils-java, libcommons-collections3-java, libcommons-daemon-java, + libcommons-dbcp-java, + libcommons-pool-java, libcommons-io-java, libcommons-logging-java, libcommons-net-java (>= 3), diff --git a/debian/libactivemq-java.README.Debian b/debian/libactivemq-java.README.Debian index ab33574..760999e 100644 --- a/debian/libactivemq-java.README.Debian +++ b/debian/libactivemq-java.README.Debian @@ -11,7 +11,6 @@ Here is a complete list of disabled modules : - activemq-openwire-generator - activemq-amqp - - activemq-jdbc-store - activemq-leveldb-store - activemq-unit-tests - activemq-all diff --git a/debian/libactivemq-java.poms b/debian/libactivemq-java.poms index 4dc53a6..ccb555c 100644 --- a/debian/libactivemq-java.poms +++ b/debian/libactivemq-java.poms @@ -35,7 +35,7 @@ activemq-stomp/pom.xml --has-package-version activemq-mqtt/pom.xml --has-package-version activemq-amqp/pom.xml --ignore activemq-kahadb-store/pom.xml --has-package-version -activemq-jdbc-store/pom.xml --ignore +activemq-jdbc-store/pom.xml --has-package-version activemq-leveldb-store/pom.xml --ignore activemq-unit-tests/pom.xml --ignore activemq-all/pom.xml --ignore diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 685827e..ea4198c 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -25,7 +25,6 @@ org.apache.activemq activemq-web jar * * * org.apache.activemq apache-activemq pom * * * org.apache.activemq.tooling activemq-tooling pom * * * commons-collections commons-collections * * * * -org.apache.activemq activeio-core * * * * org.apache.activemq activemq-unit-tests * * * * org.apache.camel camel-core * * * * org.apache.directory.server apacheds-core-integ * * * * diff --git a/debian/patches/enable-activemq-jdbc-store.patch b/debian/patches/enable-activemq-jdbc-store.patch new file mode 100644 index 0000000..06355f4 --- /dev/null +++ b/debian/patches/enable-activemq-jdbc-store.patch @@ -0,0 +1,61 @@ +Description: Enable activemq-jdbc-store module +Author: Michail Bachmann <[email protected]> + + * 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 6a549fd..4d9a0a1 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.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
