Repository: oozie Updated Branches: refs/heads/master 6a3764f81 -> 6cdc4d5d8
OOZIE-3235 Upgrade ActiveMQ to 5.15.3 (matijhs via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6cdc4d5d Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6cdc4d5d Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6cdc4d5d Branch: refs/heads/master Commit: 6cdc4d5d883f42d12e67a6d3dc49c25fbceddd82 Parents: 6a3764f Author: Andras Piros <andras.pi...@cloudera.com> Authored: Wed May 16 10:59:10 2018 +0200 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Wed May 16 10:59:10 2018 +0200 ---------------------------------------------------------------------- client/pom.xml | 7 ++++++- pom.xml | 2 +- release-log.txt | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6cdc4d5d/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 795a92d..7d36e2d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -74,7 +74,12 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <scope>compile</scope> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + <version>1.1</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/oozie/blob/6cdc4d5d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d9fe1b2..90ba8e2 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ <curator.version>2.5.0</curator.version> <jackson.version>2.4.2</jackson.version> <log4j.version>1.2.17</log4j.version> - <activemq.version>5.13.3</activemq.version> + <activemq.version>5.15.3</activemq.version> <httpcore.version>4.3.3</httpcore.version> <httpclient.version>4.3.6</httpclient.version> <kyro.version>2.22</kyro.version> http://git-wip-us.apache.org/repos/asf/oozie/blob/6cdc4d5d/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5d30c19..222c255 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3235 Upgrade ActiveMQ to 5.15.3 (matijhs via andras.piros) OOZIE-3217 Enable definition of admin users using oozie-site.xml (orova via andras.piros) OOZIE-3219 Cannot compile with hadoop 3.1.0 (dbist13, andras.piros) OOZIE-3232 Reduce heap waste by reducing duplicate string count (Misha Dmitriev via andras.piros)