From e4d58ce59676482a018a0f591877e191f7aebd4f Mon Sep 17 00:00:00 2001
From: Paul Gallagher <pgallagh@redhat.com>
Date: Mon, 24 Oct 2016 12:28:49 +0100
Subject: [PATCH] Upgrade Jolokia version

---
 .../artemis/cli/commands/etc/bootstrap-web-settings.txt       | 2 +-
 docs/user-manual/en/security.md                               | 4 ++--
 pom.xml                                                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
index 49c5e37a287..946b485415c 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
@@ -1,4 +1,4 @@
    <!-- The web server is only bound to loalhost by default -->
    <web bind="${web.protocol}://localhost:${http.port}" path="web"${extra.web.attributes}>
-       <app url="jolokia" war="jolokia-war-1.3.3.war"/>
+       <app url="jolokia" war="jolokia-war-1.3.5.war"/>
    </web>
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index dfa9f4636ee..2961cbd98c1 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -666,7 +666,7 @@ Artemis comes with a web console that allows user to browse Artemis documentatio
 web access is plain HTTP. It is configured in `bootstrap.xml`:
 
     <web bind="http://localhost:8161" path="web">
-        <app url="jolokia" war="jolokia-war-1.3.3.war"/>
+        <app url="jolokia" war="jolokia-war-1.3.5.war"/>
     </web>
 
 Alternatively you can edit the above configuration to enable secure access using HTTPS protocol. e.g.:
@@ -675,7 +675,7 @@ Alternatively you can edit the above configuration to enable secure access using
         path="web"
         keyStorePath="${artemis.instance}/etc/keystore.jks"
         keyStorePassword="password">
-        <app url="jolokia" war="jolokia-war-1.3.3.war"/>
+        <app url="jolokia" war="jolokia-war-1.3.5.war"/>
     </web>
 
 As shown in the example, to enable https the first thing to do is config the `bind` to be an `https` url. In addition,
diff --git a/pom.xml b/pom.xml
index 5a05c4f46e8..d0403753243 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,7 +558,7 @@
            <groupId>org.jolokia</groupId>
            <artifactId>jolokia-war</artifactId>
            <type>war</type>
-           <version>1.3.3</version>
+           <version>1.3.5</version>
            <!-- License: Apache 2.0 -->
         </dependency>
          <!-- ## End Jetty Wed Dependencies ## -->