Repository: hadoop Updated Branches: refs/heads/branch-2 e0b143e51 -> 21af5be51
HADOOP-14290. Update SLF4J from 1.7.10 to 1.7.25. (cherry picked from commit 5d38504071d72745c42588c7a6e76bcffb13832c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21af5be5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21af5be5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21af5be5 Branch: refs/heads/branch-2 Commit: 21af5be51a0dcc74660356934e8c2238193df689 Parents: e0b143e Author: Akira Ajisaka <[email protected]> Authored: Sun Apr 9 01:46:01 2017 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Sun Apr 9 01:48:03 2017 +0900 ---------------------------------------------------------------------- LICENSE.txt | 4 +++- hadoop-project/pom.xml | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/21af5be5/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index d7659e4..a21d46f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -516,7 +516,9 @@ hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css And the binary distribution of this product bundles these dependencies under the following license: Mockito 1.8.5 -SLF4J 1.7.10 +JUL to SLF4J bridge 1.7.25 +SLF4J API Module 1.7.25 +SLF4J LOG4J-12 Binding 1.7.25 -------------------------------------------------------------------------------- The MIT License (MIT) http://git-wip-us.apache.org/repos/asf/hadoop/blob/21af5be5/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 831197c..808d427 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -70,6 +70,9 @@ <jackson.version>1.9.13</jackson.version> <jackson2.version>2.7.8</jackson2.version> + <!-- SLF4J version --> + <slf4j.version>1.7.25</slf4j.version> + <!-- ProtocolBuffer version, used to verify the protoc version and --> <!-- define the protobuf JAR version --> <protobuf.version>2.5.0</protobuf.version> @@ -740,17 +743,17 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.10</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.7.10</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jul-to-slf4j</artifactId> - <version>1.7.10</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.eclipse.jdt</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
