OOZIE-2552 Update ActiveMQ version for security and other fixes (asasvari via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d431b8c1 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d431b8c1 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d431b8c1 Branch: refs/heads/oya Commit: d431b8c1afdb2d05e3bf4a16085b4d9ef5773647 Parents: e6b5c95 Author: Robert Kanter <rkan...@cloudera.com> Authored: Thu Sep 15 17:19:09 2016 -0700 Committer: Robert Kanter <rkan...@cloudera.com> Committed: Thu Sep 15 17:19:09 2016 -0700 ---------------------------------------------------------------------- pom.xml | 7 ++++--- release-log.txt | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d431b8c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 759d76e..de0ce82 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ <curator.version>2.5.0</curator.version> <jackson.version>1.8.8</jackson.version> <log4j.version>1.2.17</log4j.version> + <activemq.version>5.13.3</activemq.version> </properties> <modules> @@ -1134,19 +1135,19 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.10.2</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> - <version>5.10.2</version> + <version>${activemq.version}</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-kahadb-store</artifactId> - <version>5.10.2</version> + <version>${activemq.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/d431b8c1/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a71ea12..2203634 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2552 Update ActiveMQ version for security and other fixes (asasvari via rkanter) OOZIE-2571 Add spark.scala.binary.version Maven property so that Scala 2.11 can be used (jonathak via rkanter) OOZIE-2530 Allow Hive to use a different jline version (poeppt via rkanter) OOZIE-2660 Create documentation for DB Dump/Load functionality (gezapeti via rkanter)