From 28542f41babc41b9caabc412ac23ca38a29a9f7c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 4 Aug 2026 15:55:24 +0100 Subject: [PATCH 1/3] hadoop 3.4 Update Dependencies.scala --- .scala-steward.conf | 4 ++-- project/Dependencies.scala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index e57825dd8..4678ce9cc 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -1,6 +1,6 @@ updates.pin = [ - # pin to hadoop 3.3.x until 3.4.x beomes more widely adopted - { groupId = "org.apache.hadoop", version = "3.3." } + # pin to hadoop 3.4.x until 3.5.x beomes more widely adopted + { groupId = "org.apache.hadoop", version = "3.4." } # solrj 9.+ requires Java 11 { groupId = "org.apache.solr", version = "8." } # https://github.com/apache/pekko-connectors/issues/503 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1fdf42985..c03a046b3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -43,6 +43,7 @@ object Dependencies { val protobufJavaVersion = "4.35.1" val hoverflyVersion = "0.20.2" val scalaCheckVersion = "1.19.0" + val HadoopVersion = "3.4.3" // Legacy versions support Slf4J v1 for compatibility with older libs val Slf4jVersion = "2.0.18" @@ -209,8 +210,8 @@ object Dependencies { libraryDependencies ++= Seq( "org.apache.parquet" % "parquet-avro" % "1.17.1", "org.apache.avro" % "avro" % AvroVersion, - ("org.apache.hadoop" % "hadoop-client" % "3.3.6" % Test).exclude("log4j", "log4j"), - ("org.apache.hadoop" % "hadoop-common" % "3.3.6" % Test).exclude("log4j", "log4j"), + ("org.apache.hadoop" % "hadoop-client" % HadoopVersion % Test).exclude("ch.qos.reload4j", "reload4j"), + ("org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test).exclude("ch.qos.reload4j", "reload4j"), "com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion.value % Test, "org.scalacheck" %% "scalacheck" % scalaCheckVersion % Test, "org.specs2" %% "specs2-core" % "4.23.0" % Test, @@ -322,7 +323,6 @@ object Dependencies { "org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test)) } - val HadoopVersion = "3.3.6" val Hdfs = Seq( libraryDependencies ++= Seq( ("org.apache.hadoop" % "hadoop-client" % HadoopVersion).exclude("log4j", "log4j").exclude("org.slf4j", From 78ffaaa469a96ced71352903eb290a794bcd3913 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 4 Aug 2026 22:04:48 +0100 Subject: [PATCH 2/3] exclusions --- project/Dependencies.scala | 49 +++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c03a046b3..c7ebe196a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -210,8 +210,12 @@ object Dependencies { libraryDependencies ++= Seq( "org.apache.parquet" % "parquet-avro" % "1.17.1", "org.apache.avro" % "avro" % AvroVersion, - ("org.apache.hadoop" % "hadoop-client" % HadoopVersion % Test).exclude("ch.qos.reload4j", "reload4j"), - ("org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test).exclude("ch.qos.reload4j", "reload4j"), + ("org.apache.hadoop" % "hadoop-client" % HadoopVersion % Test) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), + ("org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), "com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion.value % Test, "org.scalacheck" %% "scalacheck" % scalaCheckVersion % Test, "org.specs2" %% "specs2-core" % "4.23.0" % Test, @@ -309,31 +313,38 @@ object Dependencies { val HBase = { val hbaseVersion = "1.4.14" - val hadoopVersion = "3.3.6" Seq( libraryDependencies ++= Seq( - ("org.apache.hbase" % "hbase-shaded-client" % hbaseVersion).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), - ("org.apache.hbase" % "hbase-common" % hbaseVersion).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), - ("org.apache.hadoop" % "hadoop-common" % hadoopVersion).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), - ("org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion).exclude("log4j", "log4j").exclude( - "org.slf4j", "slf4j-log4j12"), + ("org.apache.hbase" % "hbase-shaded-client" % hbaseVersion) + .exclude("log4j", "log4j") + .exclude("org.slf4j", "slf4j-log4j12"), + ("org.apache.hbase" % "hbase-common" % hbaseVersion) + .exclude("log4j", "log4j") + .exclude("org.slf4j", "slf4j-log4j12"), + ("org.apache.hadoop" % "hadoop-common" % HadoopVersion) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), + ("org.apache.hadoop" % "hadoop-mapreduce-client-core" % HadoopVersion) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), "org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test)) } val Hdfs = Seq( libraryDependencies ++= Seq( - ("org.apache.hadoop" % "hadoop-client" % HadoopVersion).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), + ("org.apache.hadoop" % "hadoop-client" % HadoopVersion) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), "org.typelevel" %% "cats-core" % "2.13.0", - ("org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion % Test).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), - ("org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), - ("org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test).exclude("log4j", "log4j").exclude("org.slf4j", - "slf4j-log4j12"), + ("org.apache.hadoop" % "hadoop-hdfs" % HadoopVersion % Test) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), + ("org.apache.hadoop" % "hadoop-common" % HadoopVersion % Test) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), + ("org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test) + .exclude("ch.qos.reload4j", "reload4j") + .exclude("org.slf4j", "slf4j-reload4j"), "org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test) ++ Mockito) val HuaweiPushKit = Seq( From b26bf197931d2d15644a2e530888295eda497598 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 4 Aug 2026 22:06:34 +0100 Subject: [PATCH 3/3] Update .scala-steward.conf --- .scala-steward.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index 4678ce9cc..36b7a626f 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -1,5 +1,5 @@ updates.pin = [ - # pin to hadoop 3.4.x until 3.5.x beomes more widely adopted + # pin to hadoop 3.4.x until 3.5.x becomes more widely adopted { groupId = "org.apache.hadoop", version = "3.4." } # solrj 9.+ requires Java 11 { groupId = "org.apache.solr", version = "8." }