You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2014/07/09 11:53:50 UTC
[05/10] git commit: Fix interior version conflicts - slf4j
Fix interior version conflicts - slf4j
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d6944861
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d6944861
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d6944861
Branch: refs/heads/master
Commit: d6944861c8b1168d6759da0b1716f1d943c7a23a
Parents: a513d8e
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:10:57 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:10:57 2014 +0100
----------------------------------------------------------------------
examples/webapps/hello-world-hadoop/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d6944861/examples/webapps/hello-world-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml
index aac1999..0a3d389 100644
--- a/examples/webapps/hello-world-hadoop/pom.xml
+++ b/examples/webapps/hello-world-hadoop/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
</dependency>
</dependencies>