Refactor by merging iceberg and akkaHttp deps

refactor affects mantis-connector-iceberg and mantis-control-plane-server build.gradle files and corresponding changes to root build.gradle (issue Netflix#345)
mabelbot · Mar 1, 2023 · 8c5929d · 8c5929d
1 parent 0140680
commit 8c5929d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,9 +70,11 @@ ext.versions = [
 
 ext.libraries = [
         akkaActor      : "com.typesafe.akka:akka-actor_${versions.scalaBinaryVersion}:${versions.akkaVersion}",
-        akkaHttp       : "com.typesafe.akka:akka-http_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
-        akkaHttpCaching: "com.typesafe.akka:akka-http-caching_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
-        akkaHttpJackson: "com.typesafe.akka:akka-http-jackson_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
+        akkaHttp       : [
+            "com.typesafe.akka:akka-http_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
+            "com.typesafe.akka:akka-http-caching_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
+            "com.typesafe.akka:akka-http-jackson_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
+        ],
         akkaSlf4j      : "com.typesafe.akka:akka-slf4j_${versions.scalaBinaryVersion}:${versions.akkaVersion}",
         akkaStream     : "com.typesafe.akka:akka-stream_${versions.scalaBinaryVersion}:${versions.akkaVersion}",
         akkaTestkit    : "com.typesafe.akka:akka-testkit_${versions.scalaBinaryVersion}:${versions.akkaVersion}",
@@ -103,10 +105,12 @@ ext.libraries = [
         hadoopS3       : "org.apache.hadoop:hadoop-aws:${versions.hadoop}",
         hamcrest       : "org.hamcrest:hamcrest-core:1.3",
         hdrHistogram   : "org.hdrhistogram:HdrHistogram:${versions.hdrHistogramVersion}",
-        icebergApi     : "org.apache.iceberg:iceberg-api:${versions.icebergVersion}",
-        icebergCore    : "org.apache.iceberg:iceberg-core:${versions.icebergVersion}",
-        icebergData    : "org.apache.iceberg:iceberg-data:${versions.icebergVersion}",
-        icebergParquet : "org.apache.iceberg:iceberg-parquet:${versions.icebergVersion}", 
+        iceberg        : [
+            "org.apache.iceberg:iceberg-api:${versions.icebergVersion}",
+            "org.apache.iceberg:iceberg-core:${versions.icebergVersion}",
+            "org.apache.iceberg:iceberg-data:${versions.icebergVersion}",
+            "org.apache.iceberg:iceberg-parquet:${versions.icebergVersion}", 
+        ],
         jcip           : "net.jcip:jcip-annotations:1.0",
         jctools        : "org.jctools:jctools-core:${versions.jctoolsVersion}",
         jodaTime       : "joda-time:joda-time:${versions.jodaTimeVersion}",

diff --git a/mantis-connectors/mantis-connector-iceberg/build.gradle b/mantis-connectors/mantis-connector-iceberg/build.gradle
@@ -38,10 +38,7 @@ dependencies {
     shadow libraries.hadoopCommon
 
     // Exclude in case there are differences in SHAs between 0.7.0 incubation versions.
-    shadow libraries.icebergApi
-    shadow libraries.icebergCore
-    shadow libraries.icebergData
-    shadow libraries.icebergParquet
+    shadow libraries.iceberg
     shadow libraries.avro
     shadow libraries.parquetHadoop
 
@@ -50,7 +47,7 @@ dependencies {
 
     testImplementation project(":mantis-runtime").sourceSets.test.output
     testImplementation libraries.hadoopCommon
-    testImplementation libraries.icebergData 
+    testImplementation libraries.iceberg[2]
     testImplementation libraries.junitJupiter
     testImplementation libraries.mockitoCore
     testImplementation libraries.spectatorApi

diff --git a/mantis-control-plane/mantis-control-plane-server/build.gradle b/mantis-control-plane/mantis-control-plane-server/build.gradle
@@ -21,8 +21,6 @@ dependencies {
     api project(':mantis-control-plane:mantis-control-plane-core')
 
     api libraries.akkaHttp
-    api libraries.akkaHttpJackson
-    api libraries.akkaHttpCaching
     api libraries.akkaStream
     api libraries.akkaSlf4j
     api libraries.akkaActor