Return-Path: 
 <commits-return-23434-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 655E21087E
	for <apmail-activemq-commits-archive@www.apache.org>;
 Tue, 24 Sep 2013 07:06:57 +0000 (UTC)
Received: (qmail 44777 invoked by uid 500); 24 Sep 2013 07:06:47 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 44736 invoked by uid 500); 24 Sep 2013 07:06:43 -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 44585 invoked by uid 99); 24 Sep 2013 07:06:32 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Sep 2013 07:06:32 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 1962490815E; Tue, 24 Sep 2013 07:06:32 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: davsclaus@apache.org
To: commits@activemq.apache.org
Date: Tue, 24 Sep 2013 07:06:32 -0000
Message-Id: <360fa446550d4cbabc56f6ff6f029b4a@git.apache.org>
In-Reply-To: <2e741c4257ee464f848abfa2fd97f31c@git.apache.org>
References: <2e741c4257ee464f848abfa2fd97f31c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] git commit: AMQ-4734: Upgrade to jolokia 1.1.3

AMQ-4734: Upgrade to jolokia 1.1.3


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

Branch: refs/heads/trunk
Commit: 488bd9c14d8e403232abfcda86eb6c1db11f3d4a
Parents: 637197b
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Tue Sep 24 08:58:48 2013 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Tue Sep 24 08:58:48 2013 +0200

----------------------------------------------------------------------
 assembly/pom.xml | 2 +-
 pom.xml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/488bd9c1/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 0e21666..eb29438 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -395,7 +395,7 @@
     <dependency>
       <groupId>org.jolokia</groupId>
       <artifactId>jolokia-core</artifactId>
-      <version>1.0.6</version>
+      <version>${jolokia-version}</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.json-simple</groupId>

http://git-wip-us.apache.org/repos/asf/activemq/blob/488bd9c1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3016d73..611ab4c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
     <jstl-version>1.1.2</jstl-version>
     <jettison-version>1.3.4</jettison-version>
     <jmock-version>2.5.1</jmock-version>
+    <jolokia-version>1.1.3</jolokia-version>
     <josql-version>1.5_5</josql-version>
     <junit-version>4.11</junit-version>
     <hamcrest-version>1.3</hamcrest-version>