You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/06/24 09:38:34 UTC
[04/12] incubator-brooklyn git commit: Fix dependency convergence
error
Fix dependency convergence error
Version conflict around commons-logging 1.1 and 1.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/effb97ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/effb97ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/effb97ee
Branch: refs/heads/master
Commit: effb97ee06e39e79601bb758af3345d3eb787d08
Parents: a92ff14
Author: Richard Downer <ri...@apache.org>
Authored: Tue Jun 23 13:09:47 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Jun 23 13:09:47 2015 +0100
----------------------------------------------------------------------
usage/camp/pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/effb97ee/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 2ac11e6..7df716e 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -59,7 +59,13 @@
<groupId>org.apache.brooklyn.camp</groupId>
<artifactId>camp-base</artifactId>
<version>${project.version}</version>
- </dependency>
+ <exclusions>
+ <!-- Dependency versions mismatch between transitive dependencies, declare explicitly -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>