merge r1512026: HADOOP-9833 move slf4j to version 1.7.5

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512048 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steve Loughran 2013-08-08 21:32:01 +00:00
parent 1af6193879
commit 16810177c9
2 changed files with 4 additions and 2 deletions

View File

@ -61,6 +61,8 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9435. Support building the JNI code against the IBM JVM.
(Tian Hong Wang via Colin Patrick McCabe)
HADOOP-9833 move slf4j to version 1.7.5 (Kousuke Saruta via stevel)
OPTIMIZATIONS
BUG FIXES

View File

@ -547,12 +547,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>