Return-Path: <commits-return-15026-archive-asf-public=cust-asf.ponee.io@brooklyn.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 6A2B4200BD4
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 16 Nov 2016 18:20:27 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 674D9160B13; Wed, 16 Nov 2016 17:20:27 +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 B33AE160B08
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 16 Nov 2016 18:20:26 +0100 (CET)
Received: (qmail 41961 invoked by uid 500); 16 Nov 2016 17:20:25 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 41915 invoked by uid 99); 16 Nov 2016 17:20: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; Wed, 16 Nov 2016 17:20:25 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id C4B31E0A00; Wed, 16 Nov 2016 17:20:25 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: svet@apache.org
To: commits@brooklyn.apache.org
Date: Wed, 16 Nov 2016 17:20:26 -0000
Message-Id: <aa019c9eabbe41dd89cf250150922afb@git.apache.org>
In-Reply-To: <414fca6a78e3400bba27b1dd2fe0bd48@git.apache.org>
References: <414fca6a78e3400bba27b1dd2fe0bd48@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/6] brooklyn-library git commit: Add javax.ws.rs-api dependency to
 software/messaging in test scope
archived-at: Wed, 16 Nov 2016 17:20:27 -0000

Add javax.ws.rs-api dependency to software/messaging in test scope


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6d08cb72
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6d08cb72
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6d08cb72

Branch: refs/heads/master
Commit: 6d08cb724ae875299ad4b42646ad28352af09476
Parents: fdad773
Author: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Authored: Tue Nov 8 18:59:20 2016 +0000
Committer: Sam Corbett <sam.corbett@cloudsoftcorp.com>
Committed: Wed Nov 16 14:34:01 2016 +0000

----------------------------------------------------------------------
 software/messaging/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/6d08cb72/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index d9984be..5f30824 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -222,6 +222,15 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <!-- We exclude jsr311-api transitive dependency from jclouds (for javax.ws.rs) due to version conflict.
+                 Therefore explicitly bring this one in.
+            -->
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- Transitive dependencies, declared explicitly due to version mismatch -->
         <dependency>
             <groupId>log4j</groupId>