You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/08/23 18:05:46 UTC
[hbase] branch branch-1.3 updated: HBASE-22866 Multiple slf4j-log4j
provider versions included in binary package (branch-1)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.3 by this push:
new e0a11a5 HBASE-22866 Multiple slf4j-log4j provider versions included in binary package (branch-1)
e0a11a5 is described below
commit e0a11a57883aabc40975a9a5091d7486d3b24b05
Author: Viraj Jasani <vi...@gmail.com>
AuthorDate: Sat Aug 17 10:54:32 2019 +0530
HBASE-22866 Multiple slf4j-log4j provider versions included in binary package (branch-1)
Signed-off-by: Andrew Purtell <ap...@apache.org>
Conflicts:
pom.xml
---
hbase-shaded/pom.xml | 1 -
hbase-testing-util/pom.xml | 1 -
pom.xml | 7 ++++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index bc88806..f5d2b2d 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -62,7 +62,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index 1b60b7e..77ec2eb 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -215,7 +215,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index ba6f1a1..e9fe690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1286,7 +1286,7 @@
<thrift.path>thrift</thrift.path>
<thrift.version>0.9.3-1</thrift.version>
<zookeeper.version>3.4.6</zookeeper.version>
- <slf4j.version>1.7.7</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<clover.version>4.0.3</clover.version>
<jamon-runtime.version>2.4.1</jamon-runtime.version>
<jettison.version>1.3.3</jettison.version>
@@ -1545,6 +1545,11 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics-core.version}</version>