Return-Path: <commits-return-43377-archive-asf-public=cust-asf.ponee.io@activemq.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4FFA2200BA8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 24 Oct 2016 14:51:44 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 4EBC4160B00; Mon, 24 Oct 2016 12:51:44 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 9E320160AEB
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 24 Oct 2016 14:51:43 +0200 (CEST)
Received: (qmail 73441 invoked by uid 500); 24 Oct 2016 12:51:42 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 73076 invoked by uid 99); 24 Oct 2016 12:51:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2016 12:51:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id E0FE2DFF5A; Mon, 24 Oct 2016 12:51:37 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: clebertsuconic@apache.org
To: commits@activemq.apache.org
Date: Mon, 24 Oct 2016 12:51:37 -0000
Message-Id: <4fbbb5c23f3b42e79d7c63947ffd0757@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] activemq-artemis git commit: Upgrade Jolokia version
archived-at: Mon, 24 Oct 2016 12:51:44 -0000

Repository: activemq-artemis
Updated Branches:
  refs/heads/master e5df63c24 -> 5315acb8f


Upgrade Jolokia version


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e4d58ce5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e4d58ce5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e4d58ce5

Branch: refs/heads/master
Commit: e4d58ce59676482a018a0f591877e191f7aebd4f
Parents: e5df63c
Author: Paul Gallagher <pgallagh@redhat.com>
Authored: Mon Oct 24 12:28:49 2016 +0100
Committer: Paul Gallagher <pgallagh@redhat.com>
Committed: Mon Oct 24 12:28:49 2016 +0100

----------------------------------------------------------------------
 .../activemq/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4d58ce5/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap-web-settings.txt
----------------------------------------------------------------------
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 49c5e37..946b485 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>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4d58ce5/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index dfa9f46..2961cbd 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,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4d58ce5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a05c4f..d040375 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 ## -->