diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-12-21 01:48:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 01:48:17 +0100 |
| commit | d0a63e2283d3d86f179e2ea16beb7fb29bc5ea1f (patch) | |
| tree | 0c1ddad51ed117dca78bf53d5123313fa7e93de2 | |
| parent | db9b6ba8774d5377277fdc93a01e8e7891c0b692 (diff) | |
| parent | 06e0941c4237b9dcb94f5c0275963fc8f891494c (diff) | |
Merge pull request #20601 from vespa-engine/remove-log4j-from-dependency-tree
Remove log4j from dependency tree
| -rw-r--r-- | vespa-hadoop/pom.xml | 43 | ||||
| -rw-r--r-- | zookeeper-client-common/pom.xml | 10 |
2 files changed, 53 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> diff --git a/zookeeper-client-common/pom.xml b/zookeeper-client-common/pom.xml index f991fa5dea9..7e23e0cb1c8 100644 --- a/zookeeper-client-common/pom.xml +++ b/zookeeper-client-common/pom.xml @@ -25,6 +25,16 @@ <artifactId>zookeeper</artifactId> <version>${zookeeper.client.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> <!-- compile scope --> |