From ea7a19f4ff9b4be38ad475222720bcea2fcee329 Mon Sep 17 00:00:00 2001
From: Mabel <70232089+mabelbot@users.noreply.github.com>
Date: Wed, 1 Mar 2023 16:25:41 -0800
Subject: [PATCH] Refactor mantis-publish-netty-guice 3rd party dependency
 specifications

first pass at refactor 3rd party dependency specifications for mantis-publish-netty-guice and corresponding changes to root build.gradle. (issue #345)
---
 build.gradle                                        |  4 ++++
 .../mantis-publish-netty-guice/build.gradle         | 13 +++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2f9a32dbf..b9c561885 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,7 @@ ext.versions = [
         fenzoVersion : '0.13.8',
         flink    : "1.14.2",
         gsonVersion : "2.8.+",
+        guiceVersion : "4.2.2",
         hadoop   : "2.7.7",
         hdrHistogramVersion : '2.+',
         icebergVersion : "0.14.+",
@@ -82,6 +83,7 @@ ext.libraries = [
         akkaHttpTestkit: "com.typesafe.akka:akka-http-testkit_${versions.scalaBinaryVersion}:${versions.akkaHttpVersion}",
         archaius2Api   : "com.netflix.archaius:archaius2-api:${versions.archaiusVersion}",
         archaius2Core  : "com.netflix.archaius:archaius2-core:${versions.archaiusVersion}",
+        archaius2Guice : "com.netflix.archaius:archaius2-guice:${versions.archaiusVersion}",
         asyncHttpClient: "org.asynchttpclient:async-http-client:2.12.3",
         avro           : "org.apache.avro:avro:${versions.avroVersion}",
         commonsIo      : "commons-io:commons-io:2.11.0",
@@ -102,6 +104,7 @@ ext.libraries = [
                 "junit:junit-dep:${versions.junit4}",
         ],
         gson           : "com.google.code.gson:gson:${versions.gsonVersion}",
+        guice          : "com.google.inject:guice:${versions.guiceVersion}",
         hadoopCommon   : "org.apache.hadoop:hadoop-common:${versions.hadoop}",
         hadoopS3       : "org.apache.hadoop:hadoop-aws:${versions.hadoop}",
         hamcrest       : "org.hamcrest:hamcrest-core:1.3",
@@ -145,6 +148,7 @@ ext.libraries = [
         spectatorExtIpc: "com.netflix.spectator:spectator-ext-ipc:${versions.spectator}",
         spectatorApi0 : "com.netflix.spectator:spectator-api:0.134.0",
         spectatorExtIpc0: "com.netflix.spectator:spectator-ext-ipc:0.134.0",
+        spectatorPlugin: "com.netflix.spectator:spectator-nflx-plugin:${versions.spectatorVersion}",
         spotifyFutures : "com.spotify:completable-futures:0.3.1",
         testng         : "org.testng:testng:${versions.testngVersion}",
         vavr           : "io.vavr:vavr:${versions.vavr}",
diff --git a/mantis-publish/mantis-publish-netty-guice/build.gradle b/mantis-publish/mantis-publish-netty-guice/build.gradle
index 5bf64bd0f..04cddf1c3 100644
--- a/mantis-publish/mantis-publish-netty-guice/build.gradle
+++ b/mantis-publish/mantis-publish-netty-guice/build.gradle
@@ -14,20 +14,17 @@
  * limitations under the License.
  */
 ext {
-    archaiusVersion = 'latest.release'
-    guiceVersion = '4.2.2'
-    spectatorVersion = '0.96.0'
 }
 
 dependencies {
     api project(':mantis-publish:mantis-publish-core')
 
     implementation project(':mantis-publish:mantis-publish-netty')
-    implementation "com.netflix.spectator:spectator-ext-ipc:$spectatorVersion"
-    implementation "com.netflix.archaius:archaius2-core:$archaiusVersion"
-    implementation "com.netflix.archaius:archaius2-guice:$archaiusVersion"
-    implementation "com.google.inject:guice:$guiceVersion"
-    implementation "com.netflix.spectator:spectator-nflx-plugin:$spectatorVersion"
+    implementation libraries.spectatorExtIpc0
+    implementation libraries.archaius2Core
+    implementation libraries.archaius2Guice
+    implementation libraries.guice
+    implementation libraries.spectatorPlugin
 
     implementation libraries.slf4jApi