Return-Path: 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 43D99200B32 for ; Wed, 8 Jun 2016 14:15:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 42909160A29; Wed, 8 Jun 2016 12:15:34 +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 B30A3160A2E for ; Wed, 8 Jun 2016 14:15:33 +0200 (CEST) Received: (qmail 76165 invoked by uid 500); 8 Jun 2016 12:15:32 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 76156 invoked by uid 99); 8 Jun 2016 12:15:32 -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; Wed, 08 Jun 2016 12:15:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AFCB8DFC74; Wed, 8 Jun 2016 12:15:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtully@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: AMQ-5574 - allow import osgi of jms 2.x spec jar Date: Wed, 8 Jun 2016 12:15:32 +0000 (UTC) archived-at: Wed, 08 Jun 2016 12:15:34 -0000 Repository: activemq Updated Branches: refs/heads/master 5fd307cd9 -> bce5e5e9c AMQ-5574 - allow import osgi of jms 2.x spec jar Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/bce5e5e9 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/bce5e5e9 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/bce5e5e9 Branch: refs/heads/master Commit: bce5e5e9c9c3f39c1a9dc57faed3e8c01b226b7b Parents: 5fd307c Author: gtully Authored: Wed Jun 8 13:15:15 2016 +0100 Committer: gtully Committed: Wed Jun 8 13:15:15 2016 +0100 ---------------------------------------------------------------------- activemq-osgi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/bce5e5e9/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index a9975c8..89e9ba6 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -65,7 +65,7 @@ org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)", org.apache.xbean*;version="[3.13,5)", javax.annotation*, - javax.jms*, + javax.jms*;version="[1.1,3)", javax.management*, javax.transaction*, javax.naming*;resolution:=optional,