Return-Path: <commits-return-49020-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 B0D8B200D19
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  6 Oct 2017 21:43:49 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id AF5D51609E1; Fri,  6 Oct 2017 19:43:49 +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 003F81609D0
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  6 Oct 2017 21:43:48 +0200 (CEST)
Received: (qmail 65733 invoked by uid 500); 6 Oct 2017 19:43:48 -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 65723 invoked by uid 99); 6 Oct 2017 19:43:48 -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; Fri, 06 Oct 2017 19:43:48 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 5F6BCF5CEA; Fri,  6 Oct 2017 19:43:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tabish@apache.org
To: commits@activemq.apache.org
Message-Id: <f774145aed494997a178fd7396afd737@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: activemq git commit: AMQ-6830 Update Qpid JMS and Netty
Date: Fri,  6 Oct 2017 19:43:46 +0000 (UTC)
archived-at: Fri, 06 Oct 2017 19:43:49 -0000

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x e1adcd28b -> 0e0f5ea8f


AMQ-6830 Update Qpid JMS and Netty

Update to latest Qpid JMS 0.26.0 and Netty 4.1.16.Final
(cherry picked from commit 0e6fc19cff88eb5bc5c7b02aa274835cdafc26b9)


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

Branch: refs/heads/activemq-5.15.x
Commit: 0e0f5ea8ff1fb08cb87e0b1fd22f308d6d435611
Parents: e1adcd2
Author: Timothy Bish <tabish121@gmail.com>
Authored: Fri Oct 6 15:40:38 2017 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Fri Oct 6 15:41:11 2017 -0400

----------------------------------------------------------------------
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/0e0f5ea8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fff1c6d..9272f77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,8 +104,8 @@
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.6</zookeeper-version>
     <qpid-proton-version>0.22.0</qpid-proton-version>
-    <qpid-jms-version>0.25.0</qpid-jms-version>
-    <qpid-jms-netty-version>4.1.14.Final</qpid-jms-netty-version>
+    <qpid-jms-version>0.26.0</qpid-jms-version>
+    <qpid-jms-netty-version>4.1.16.Final</qpid-jms-netty-version>
     <qpid-jms-proton-version>0.22.0</qpid-jms-proton-version>
     <netty-all-version>4.1.14.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>