Skip to content

Commit

Permalink
Remove Hadoop protobuf shaded (#202)
Browse files Browse the repository at this point in the history
* Remove Hadoop protobuf shaded

* Apply the linter

---------

Co-authored-by: stheppi <[email protected]>
  • Loading branch information
stheppi and stheppi authored Jan 22, 2025
1 parent 9bd04f7 commit 6f65d1f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ object Dependencies {
val jedisVersion = "5.1.5"
val gsonVersion = "2.11.0"

val classGraphVersion = "4.8.179"
val nimbusJoseJwtVersion = "9.47"
val hadoopVersion = "3.4.0"
val hadoopShadedProtobufVersion = "1.2.0"
val classGraphVersion = "4.8.179"
val nimbusJoseJwtVersion = "9.47"
val hadoopVersion = "3.4.0"
//val hadoopShadedProtobufVersion = "1.2.0"

val airCompressorVersion = "2.0.2"
val zstdVersion = "1.5.6-8"
Expand Down Expand Up @@ -276,9 +276,9 @@ object Dependencies {
hiveExcludes("org.apache.hadoop" % "hadoop-mapreduce-client" % hadoopVersion)
lazy val hadoopMapReduceClientCore: ModuleID =
hiveExcludes("org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion)
lazy val hadoopShadedProtobuf: ModuleID =
/* lazy val hadoopShadedProtobuf: ModuleID =
hiveExcludes("org.apache.hadoop.thirdparty" % "hadoop-shaded-protobuf_3_21" % hadoopShadedProtobufVersion)

*/
lazy val calciteCore = hiveExcludes("org.apache.calcite" % "calcite-core" % calciteVersion)
.excludeAll(ExclusionRule(organization = "io.swagger"))
.excludeAll(ExclusionRule(organization = "io.netty"))
Expand Down Expand Up @@ -493,7 +493,7 @@ trait Dependencies {
hadoopMapReduce,
hadoopMapReduceClient,
hadoopMapReduceClientCore,
hadoopShadedProtobuf,
//hadoopShadedProtobuf,
commonsConfig,
openCsv,
jacksonCore,
Expand Down

0 comments on commit 6f65d1f

Please sign in to comment.