-
-
Notifications
You must be signed in to change notification settings - Fork 6
/
Copy path04-include-dataformat-xml.patch
58 lines (55 loc) · 2.08 KB
/
04-include-dataformat-xml.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
Include jackson-dataformat-xml.
From: Lars Francke <[email protected]>
This is needed for XmlLayout to work so our structured logging works.
It is an optional dependency of log4j2 so we need to make sure to include
it.
---
hbase-assembly/pom.xml | 5 +++++
pom.xml | 12 ++++++++++++
2 files changed, 17 insertions(+)
diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml
index 1564851b85..0786288a84 100644
--- a/hbase-assembly/pom.xml
+++ b/hbase-assembly/pom.xml
@@ -222,6 +222,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
+ <dependency>
+ <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git a/pom.xml b/pom.xml
index b420025c6c..819e021d86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1149,6 +1149,11 @@
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
@@ -1159,6 +1164,13 @@
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <!-- This is an optional dependency of log4j which is needed to use XmlLayout -->
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson.databind.version}</version>
+ </dependency>
+
<!-- Avro dependencies we mostly get transitively, manual version coallescing -->
<dependency>
<groupId>org.apache.avro</groupId>