summaryrefslogtreecommitdiffstats
path: root/vespa-hadoop
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-12-20 23:39:31 +0100
committergjoranv <gv@verizonmedia.com>2021-12-21 01:15:48 +0100
commit06e0941c4237b9dcb94f5c0275963fc8f891494c (patch)
tree0c1ddad51ed117dca78bf53d5123313fa7e93de2 /vespa-hadoop
parent598c8c48ac61517687b7245aa0f13da60fb69593 (diff)
Remove log4j from the dependency tree of vespa-hadoop.
- It was only included via provided deps. - Use slf4j-jdk14 as replacement for logging in unit tests.
Diffstat (limited to 'vespa-hadoop')
-rw-r--r--vespa-hadoop/pom.xml43
1 files changed, 43 insertions, 0 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index 9c3ec0d5e07..d6d9d0e2141 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -28,12 +28,32 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.pig</groupId>
@@ -73,8 +93,31 @@
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <!-- Use slf4j's replacement for log4j to avoid log4j in the dependency tree -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- Bind to java.util.logging -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>