From 32b57feaa017f88e799df02aa5944bd79e185f95 Mon Sep 17 00:00:00 2001
From: jamesbr3 <33660060+jamesbr3@users.noreply.github.com>
Date: Mon, 30 Apr 2018 10:24:08 +0100
Subject: [PATCH] Update jolokia to 1.5.0 (#2617)

* Update jolokia to 1.5.0

* adding jolokia update to changelog
---
 docs/source/changelog.rst                | 2 ++
 node/src/main/resources/build.properties | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
index debca55b65..53dadbeead 100644
--- a/docs/source/changelog.rst
+++ b/docs/source/changelog.rst
@@ -287,6 +287,8 @@ Version 3.0
 * ``TransactionSignature`` includes a new ``partialMerkleTree`` property, required for future support of signing over
   multiple transactions at once.
 
+* Updating Jolokia dependency to latest version (includes security fixes)
+
 .. _changelog_v1:
 
 Release 1.0
diff --git a/node/src/main/resources/build.properties b/node/src/main/resources/build.properties
index 72577915e7..5f1344f9d4 100644
--- a/node/src/main/resources/build.properties
+++ b/node/src/main/resources/build.properties
@@ -2,4 +2,4 @@
 # Note: sadly, due to present limitation of IntelliJ-IDEA in processing resource files, these constants cannot be
 # imported from top-level 'constants.properties' file
 
-jolokiaAgentVersion=1.3.7
\ No newline at end of file
+jolokiaAgentVersion=1.5.0