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 CE04A200ABE for ; Fri, 20 May 2016 15:15:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CCAD31609AF; Fri, 20 May 2016 13:15:26 +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 1FA8B160A0E for ; Fri, 20 May 2016 15:15:25 +0200 (CEST) Received: (qmail 64576 invoked by uid 500); 20 May 2016 13:15:25 -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 64560 invoked by uid 99); 20 May 2016 13:15:25 -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, 20 May 2016 13:15:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19FDDDFA1E; Fri, 20 May 2016 13:15:25 +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: Fri, 20 May 2016 13:15:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq git commit: AMQ-6298: Moved Spring Import-Package wildcard below other Spring imports. archived-at: Fri, 20 May 2016 13:15:27 -0000 AMQ-6298: Moved Spring Import-Package wildcard below other Spring imports. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6d539b4f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6d539b4f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6d539b4f Branch: refs/heads/activemq-5.13.x Commit: 6d539b4f0127285f77c350a474a5bde867c34d72 Parents: 405280e Author: Seth Leger Authored: Fri May 20 04:57:51 2016 -0400 Committer: Claus Ibsen Committed: Fri May 20 15:15:11 2016 +0200 ---------------------------------------------------------------------- activemq-osgi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/6d539b4f/activemq-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 9efc733..8801443 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -56,10 +56,10 @@ org.apache.zookeeper*;resolution:=optional, org.fusesource.leveldbjni*;resolution:=optional, org.fusesource.hawtjni*;resolution:=optional, - org.springframework*;version="[3,5)";resolution:=optional, org.springframework.jms*;version="[3,5)";resolution:=optional, org.springframework.osgi*;version="[1,4]";resolution:=optional, org.springframework.transaction*;version="[3,5)";resolution:=optional, + org.springframework*;version="[3,5)";resolution:=optional, org.xmlpull*;resolution:=optional, scala*;resolution:=optional, org.apache.xbean.spring*;resolution:=optional;version="[3.13,5)",