brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [2/6] brooklyn-library git commit: Add javax.ws.rs-api dependency to software/messaging in test scope
Date Wed, 16 Nov 2016 17:20:26 GMT
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>


Mime
View raw message