Skip to content

Commit 69c1d59

Browse files
authored
Merge pull request #280 from marklogic/feature/log4j1-fix
MLE-17470 Bumped zookeeper to remove log4j 1.x dependency
2 parents 3d4bf73 + 5a68c1c commit 69c1d59

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

flux-cli/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ configurations {
1212
shadowDependencies
1313
}
1414

15+
configurations.all {
16+
// By default, Spark 3.5.3 does not include the log4j 1.x dependency via its zookeeper dependency. But somehow, by
17+
// adding hadoop-client 3.3.4 to the mix, the log4j 1.x dependency comes via the zookeeper 3.6.3 dependency. Per
18+
// the release notes at https://zookeeper.apache.org/doc/r3.6.4/releasenotes.html, using zookeeper 3.6.4 - which
19+
// removes log4j 1.x, thus avoiding the major CVE associated with log4j 1.x - appears safe, which is confirmed by
20+
// tests as well.
21+
resolutionStrategy {
22+
force "org.apache.zookeeper:zookeeper:3.6.4"
23+
}
24+
}
25+
1526
dependencies {
1627
implementation("org.apache.spark:spark-sql_2.12:3.5.3") {
1728
// The rocksdbjni dependency weighs in at 50mb and so far does not appear necessary for our use of Spark.

0 commit comments

Comments
 (0)