Author: apresta
Date: Mon Nov 5 23:23:01 2012
New Revision: 1406005
URL: http://svn.apache.org/viewvc?rev=1406005&view=rev
Log:
GIRAPH-402: slf4j dependency bug (nitay via apresta)
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/giraph/pom.xml
giraph/trunk/pom.xml
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1406005&r1=1406004&r2=1406005&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Nov 5 23:23:01 2012
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-402: slf4j dependency bug (nitay via apresta)
+
GIRAPH-401: Metrics should be disabled by default (apresta)
GIRAPH-400: Refactoring broke
Modified: giraph/trunk/giraph/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph/pom.xml?rev=1406005&r1=1406004&r2=1406005&view=diff
==============================================================================
--- giraph/trunk/giraph/pom.xml (original)
+++ giraph/trunk/giraph/pom.xml Mon Nov 5 23:23:01 2012
@@ -289,6 +289,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
Modified: giraph/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/pom.xml?rev=1406005&r1=1406004&r2=1406005&view=diff
==============================================================================
--- giraph/trunk/pom.xml (original)
+++ giraph/trunk/pom.xml Mon Nov 5 23:23:01 2012
@@ -216,6 +216,7 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hbase.version>0.90.5</hbase.version>
<jackson.version>1.8.0</jackson.version>
+ <slf4j.version>1.7.2</slf4j.version>
<forHadoop>for-hadoop-${hadoop.version}</forHadoop>
</properties>
@@ -737,6 +738,12 @@ under the License.
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>2.1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -821,8 +828,13 @@ under the License.
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.2</version>
+ <version>${slf4j.version}</version>
</dependency>
<!-- provided dependencies. sorted lexicographically. -->
