From ba469cc1ff83c5ddbf0753122f6923c887cb4ee8 Mon Sep 17 00:00:00 2001
From: Mabel <70232089+mabelbot@users.noreply.github.com>
Date: Tue, 28 Feb 2023 18:25:56 -0800
Subject: [PATCH] Refactor mantis-connector-kafka 3rd party dependency
 specifications

first pass at refactor 3rd party dependency specifications for mantis-connector-kafka and corresponding changes to root build.gradle (issue #345)
---
 build.gradle                                    |  7 +++++++
 .../mantis-connector-kafka/build.gradle         | 17 ++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 468a5cd4f..de245bda3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,7 @@ buildscript {
 }
 
 ext.versions = [
+        archaiusVersion: "latest.release",
         avroVersion : "1.10.2",
         flink    : "1.14.2",
         gsonVersion : "2.8.+",
@@ -43,6 +44,7 @@ ext.versions = [
         jctoolsVersion : "1.+",
         junit4   : "4.11",
         junit5   : "5.4.+",
+        kafkaVersion : "2.2.+",
         mockito  : "2.0.+",
         mockito3 : "3.+",
         nettyVersion : "4.1.34.Final",
@@ -54,6 +56,8 @@ ext.versions = [
 ]
 
 ext.libraries = [
+        archaius2Api   : "com.netflix.archaius:archaius2-api:${versions.archaiusVersion}",
+        archaius2Core  : "com.netflix.archaius:archaius2-core:${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",
@@ -84,6 +88,7 @@ ext.libraries = [
                 "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}",
                 "org.junit.jupiter:junit-jupiter-params:${versions.junit5}",
         ],
+        kafkaClients   : "org.apache.kafka:kafka-clients:${versions.kafkaVersion}",
         mantisShaded   : "io.mantisrx:mantis-shaded:2.0.2",
         mockitoAll     : "org.mockito:mockito-all:${versions.mockito}",
         mockitoCore    : "org.mockito:mockito-core:${versions.mockito}",
@@ -99,10 +104,12 @@ ext.libraries = [
         slf4jLog4j12   : "org.slf4j:slf4j-log4j12:${versions.slf4j}",
         snappyJava     : "org.xerial.snappy:snappy-java:${versions.snappyVersion}",
         spectatorApi   : "com.netflix.spectator:spectator-api:${versions.spectator}",
+        spectatorApiv0 : "com.netflix.spectator:spectator-api:0.82.+",
         spotifyFutures : "com.spotify:completable-futures:0.3.1",
         vavr           : "io.vavr:vavr:${versions.vavr}",
         vavrJackson    : "io.vavr:vavr-jackson:${versions.vavr}",
         vavrTest       : "io.vavr:vavr-test:${versions.vavr}",
+        wiremock       : "com.github.tomakehurst:wiremock-jre8:2.21.0",
         zip4j          : "net.lingala.zip4j:zip4j:2.9.0",
 ]
 
diff --git a/mantis-connectors/mantis-connector-kafka/build.gradle b/mantis-connectors/mantis-connector-kafka/build.gradle
index 375bd8be6..621acd4fd 100644
--- a/mantis-connectors/mantis-connector-kafka/build.gradle
+++ b/mantis-connectors/mantis-connector-kafka/build.gradle
@@ -16,26 +16,21 @@
 
 apply plugin: 'mantis'
 
-ext {
-    archaiusVersion = '2.3.+'
-    spectatorVersion = '0.82.+'
-    kafkaVersion = '2.2.+'
-}
 
 dependencies {
     implementation libraries.mantisShaded
     implementation project(":mantis-runtime")
 
-    api "org.apache.kafka:kafka-clients:$kafkaVersion"
+    api libraries.kafkaClients
 
     api libraries.rxJava
-    api "com.netflix.spectator:spectator-api:$spectatorVersion"
-    api "com.netflix.archaius:archaius2-api:$archaiusVersion"
-    api "com.netflix.archaius:archaius2-core:$archaiusVersion"
+    api libraries.spectatorApiv0
+    api libraries.archaius2Api
+    api libraries.archaius2Core
 
     testImplementation libraries.junit4
     testImplementation project(':mantis-runtime').sourceSets.test.output
     testImplementation libraries.mockitoAll
-    testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0"
-    testCompileOnly "com.netflix.archaius:archaius2-core:$archaiusVersion"
+    testImplementation libraries.wiremock
+    testCompileOnly libraries.archaius2Core
 }