From 4408fa09caf2723ecaff899260773796ebf1437c Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 12:02:51 -0800 Subject: [PATCH 01/26] Update mantis-common 3rd party dependency specifications chore: update 3rd party dependency specifications for mantis-common and corresponding changes to root build.gradle (issue #345) --- build.gradle | 6 ++++++ mantis-common/build.gradle | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 0cf311d9b..9095b5723 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,9 @@ ext.libraries = [ ], hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", + hamcrest : "org.hamcrest:hamcrest-core:1.3", + jcip : "net.jcip:jcip-annotations:1.0", + jctools : "org.jctools:jctools-core:${versions.jctoolsVersion}", junitJupiter : [ "org.junit.jupiter:junit-jupiter-api:${versions.junit5}", "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}", @@ -73,10 +76,13 @@ ext.libraries = [ mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", mockneat : "net.andreinc:mockneat:0.4.8", + nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", + nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", rxJava : "io.reactivex:rxjava:1.3.8", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", slf4jLog4j12 : "org.slf4j:slf4j-log4j12:${versions.slf4j}", + snappyJava : "org.xerial.snappy:snappy-java:${versions.snappyVersion}", spectatorApi : "com.netflix.spectator:spectator-api:${versions.spectator}", spotifyFutures : "com.spotify:completable-futures:0.3.1", vavr : "io.vavr:vavr:${versions.vavr}", diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index d7e83080b..55dcc2960 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -24,11 +24,11 @@ ext { dependencies { api project(":mantis-common-serde") - api "io.netty:netty-codec-http:$nettyVersion" - api "io.netty:netty-buffer:$nettyVersion" + api libraries.nettyCodec + api libraries.nettyBuffer api group: 'io.netty', name: 'netty-transport-native-epoll', classifier: 'linux-x86_64', version: nettyVersion - api "org.xerial.snappy:snappy-java:$snappyVersion" - api "org.jctools:jctools-core:$jctoolsVersion" + api libraries.snappyJava + api libraries.jctools // spectatorApi should be packaged at entry point level to avoid version conflicts. compileOnly libraries.spectatorApi @@ -39,11 +39,11 @@ dependencies { api libraries.slf4jApi api libraries.slf4jLog4j12 implementation libraries.commonsIo - implementation 'net.jcip:jcip-annotations:1.0' + implementation libraries.jcip testImplementation libraries.spectatorApi testImplementation libraries.commonsLang3 - testImplementation "org.hamcrest:hamcrest-core:1.3" + testImplementation libraries.hamcrest testImplementation libraries.junit4 testImplementation libraries.mockitoCore } From 091cd5c0434687993714735f4deb730a500932a2 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:42:32 -0800 Subject: [PATCH 02/26] Refactor mantis-common libraries.nettyEpoll chore: update netty-transport-native-epoll dependency specification to libraries.nettyEpoll in mantis-common and corresponding changes to root build.gradle (issue #345) --- build.gradle | 1 + mantis-common/build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9095b5723..28fb5c872 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,7 @@ ext.libraries = [ mockneat : "net.andreinc:mockneat:0.4.8", nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", + nettyEpoll : "io.netty:netty-transport-native-epoll:${versions.nettyVersion}:linux-x86_64", rxJava : "io.reactivex:rxjava:1.3.8", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index 55dcc2960..6b8d2e5ef 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -26,7 +26,7 @@ dependencies { api project(":mantis-common-serde") api libraries.nettyCodec api libraries.nettyBuffer - api group: 'io.netty', name: 'netty-transport-native-epoll', classifier: 'linux-x86_64', version: nettyVersion + api libraries.nettyEpoll api libraries.snappyJava api libraries.jctools From 05a20f35c328a0ac49b06bf15c2e9e86cff2e309 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 14:54:51 -0800 Subject: [PATCH 03/26] Refactor mantis-common by removing ext variable refactor mantis-common build.gradle by moving ext versions to root build.gradle and removing ext variable (issue #345) --- build.gradle | 3 +++ mantis-common/build.gradle | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 28fb5c872..4e9a11b60 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,13 @@ buildscript { ext.versions = [ flink : "1.14.2", hadoop : "2.7.7", + jctoolsVersion : "1.+", junit4 : "4.11", junit5 : "5.4.+", mockito : "2.0.+", mockito3 : "3.+", + nettyVersion : "4.1.34.Final", + snappyVersion : "1.1.+", spectator: "1.3.+", slf4j : "1.7.0", vavr : "0.9.2", diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index 6b8d2e5ef..0389c7d9c 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -16,12 +16,6 @@ apply plugin: 'java-test-fixtures' -ext { - jctoolsVersion = '1.+' - nettyVersion = '4.1.17.Final' - snappyVersion = '1.1.+' -} - dependencies { api project(":mantis-common-serde") api libraries.nettyCodec From 2d27da484b39d22e656b5f46817f80a1fc378a02 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 17:38:21 -0800 Subject: [PATCH 04/26] Refactor mantis-connector-iceberg 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-connector-iceberg and corresponding changes to root build.gradle (issue #345) --- build.gradle | 9 +++++++ .../mantis-connector-iceberg/build.gradle | 26 +++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 4e9a11b60..5f8f62c3e 100644 --- a/build.gradle +++ b/build.gradle @@ -35,14 +35,17 @@ buildscript { } ext.versions = [ + avroVersion : "1.10.2", flink : "1.14.2", hadoop : "2.7.7", + icebergVersion : "0.14.+", jctoolsVersion : "1.+", junit4 : "4.11", junit5 : "5.4.+", mockito : "2.0.+", mockito3 : "3.+", nettyVersion : "4.1.34.Final", + parquetVersion : "1.12.0", snappyVersion : "1.1.+", spectator: "1.3.+", slf4j : "1.7.0", @@ -51,6 +54,7 @@ ext.versions = [ ext.libraries = [ asyncHttpClient: "org.asynchttpclient:async-http-client:2.12.3", + avro : "org.apache.avro:avro:${versions.avroVersion}", commonsIo : "commons-io:commons-io:2.11.0", commonsLang3 : 'org.apache.commons:commons-lang3:3.5', flinkCore : "org.apache.flink:flink-core:${versions.flink}", @@ -67,6 +71,10 @@ ext.libraries = [ hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", hamcrest : "org.hamcrest:hamcrest-core:1.3", + 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}", jcip : "net.jcip:jcip-annotations:1.0", jctools : "org.jctools:jctools-core:${versions.jctoolsVersion}", junitJupiter : [ @@ -82,6 +90,7 @@ ext.libraries = [ nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", nettyEpoll : "io.netty:netty-transport-native-epoll:${versions.nettyVersion}:linux-x86_64", + parquetHadoop : "org.apache.parquet:parquet-hadoop:${versions.parquetVersion}", rxJava : "io.reactivex:rxjava:1.3.8", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", diff --git a/mantis-connectors/mantis-connector-iceberg/build.gradle b/mantis-connectors/mantis-connector-iceberg/build.gradle index 8a5bbf9a2..64cf26511 100644 --- a/mantis-connectors/mantis-connector-iceberg/build.gradle +++ b/mantis-connectors/mantis-connector-iceberg/build.gradle @@ -17,12 +17,6 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'mantis' -ext { - hadoopVersion = '2.7.3' - icebergVersion = '0.14.+' - avroVersion = '1.10.2' - parquetVersion = '1.12.0' -} dependencies { configurations { @@ -33,7 +27,7 @@ dependencies { // we want a parquet version above 1.12.0 because we need this fix // https://issues.apache.org/jira/browse/PARQUET-1851 resolutionStrategy { - force "org.apache.parquet:parquet-hadoop:${parquetVersion}" + force libraries.parquetHadoop } } } @@ -41,22 +35,22 @@ dependencies { implementation libraries.slf4jApi // We only need the Configuration interface. Users can bring their own hadoop-common version. - shadow "org.apache.hadoop:hadoop-common:$hadoopVersion" + shadow libraries.hadoopCommon // Exclude in case there are differences in SHAs between 0.7.0 incubation versions. - shadow "org.apache.iceberg:iceberg-api:$icebergVersion" - shadow "org.apache.iceberg:iceberg-core:$icebergVersion" - shadow "org.apache.iceberg:iceberg-data:$icebergVersion" - shadow "org.apache.iceberg:iceberg-parquet:$icebergVersion" - shadow "org.apache.avro:avro:$avroVersion" - shadow "org.apache.parquet:parquet-hadoop:${parquetVersion}" + shadow libraries.icebergApi + shadow libraries.icebergCore + shadow libraries.icebergData + shadow libraries.icebergParquet + shadow libraries.avro + shadow libraries.parquetHadoop // We only need this for local mains(). Users bring their own implementation. shadow libraries.slf4jLog4j12 testImplementation project(":mantis-runtime").sourceSets.test.output - testImplementation "org.apache.hadoop:hadoop-common:$hadoopVersion" - testImplementation "org.apache.iceberg:iceberg-data:$icebergVersion" + testImplementation libraries.hadoopCommon + testImplementation libraries.icebergData testImplementation libraries.junitJupiter testImplementation libraries.mockitoCore testImplementation libraries.spectatorApi From fce4d3d8550e23665ec7f9a2d975537409965a55 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 18:09:49 -0800 Subject: [PATCH 05/26] Refactor mantis-connector-job 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-connector-job and corresponding changes to root build.gradle (issue #345) --- build.gradle | 2 ++ mantis-connectors/mantis-connector-job/build.gradle | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5f8f62c3e..468a5cd4f 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,7 @@ buildscript { ext.versions = [ avroVersion : "1.10.2", flink : "1.14.2", + gsonVersion : "2.8.+", hadoop : "2.7.7", icebergVersion : "0.14.+", jctoolsVersion : "1.+", @@ -68,6 +69,7 @@ ext.libraries = [ "junit:junit:${versions.junit4}", "junit:junit-dep:${versions.junit4}", ], + gson : "com.google.code.gson:gson:${versions.gsonVersion}", hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", hamcrest : "org.hamcrest:hamcrest-core:1.3", diff --git a/mantis-connectors/mantis-connector-job/build.gradle b/mantis-connectors/mantis-connector-job/build.gradle index 5cea170dd..5143c2d7c 100644 --- a/mantis-connectors/mantis-connector-job/build.gradle +++ b/mantis-connectors/mantis-connector-job/build.gradle @@ -16,9 +16,6 @@ apply plugin: 'mantis' -ext { - gsonVersion = '2.8.+' -} dependencies { implementation project(":mantis-runtime") @@ -26,6 +23,6 @@ dependencies { implementation project(":mantis-control-plane:mantis-control-plane-core") implementation project(":mantis-publish:mantis-publish-core") - implementation "com.google.code.gson:gson:$gsonVersion" + implementation libraries.gson implementation libraries.vavr } 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 06/26] 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 } From 55fd2b8277d95e9b417d1297ea8793d465d741d2 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 22:07:05 -0800 Subject: [PATCH 07/26] Refactor mantis-control-plane-core 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-control-plane-core and corresponding changes to root build.gradle (issue #345) --- build.gradle | 16 +++++++++++- .../mantis-control-plane-core/build.gradle | 25 ++++++------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index de245bda3..2850504a3 100644 --- a/build.gradle +++ b/build.gradle @@ -37,14 +37,21 @@ buildscript { ext.versions = [ archaiusVersion: "latest.release", avroVersion : "1.10.2", + cliParserVersion : '1.1.1', + configMagicVersion : '0.11', + curatorVersion : '2.12.+', flink : "1.14.2", gsonVersion : "2.8.+", hadoop : "2.7.7", + hdrHistogramVersion : '2.+', icebergVersion : "0.14.+", jctoolsVersion : "1.+", + jodaTimeVersion : '2.+', + jsonVersion : '20180813', junit4 : "4.11", junit5 : "5.4.+", kafkaVersion : "2.2.+", + mesosVersion : '1.7.2', mockito : "2.0.+", mockito3 : "3.+", nettyVersion : "4.1.34.Final", @@ -52,6 +59,7 @@ ext.versions = [ snappyVersion : "1.1.+", spectator: "1.3.+", slf4j : "1.7.0", + testngVersion : '6.14.+', vavr : "0.9.2", ] @@ -62,6 +70,8 @@ ext.libraries = [ avro : "org.apache.avro:avro:${versions.avroVersion}", commonsIo : "commons-io:commons-io:2.11.0", commonsLang3 : 'org.apache.commons:commons-lang3:3.5', + configMagic : "org.skife.config:config-magic:${versions.configMagicVersion}", + cliParser : "com.github.spullara.cli-parser:cli-parser:${versions.cliParserVersion}", flinkCore : "org.apache.flink:flink-core:${versions.flink}", flinkRpcApi : [ "org.apache.flink:flink-rpc-core:${versions.flink}", @@ -77,12 +87,15 @@ ext.libraries = [ hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", 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}", jcip : "net.jcip:jcip-annotations:1.0", jctools : "org.jctools:jctools-core:${versions.jctoolsVersion}", + jodaTime : "joda-time:joda-time:${versions.jodaTimeVersion}", + json : "org.json:json:${versions.jsonVersion}", junitJupiter : [ "org.junit.jupiter:junit-jupiter-api:${versions.junit5}", "org.junit.jupiter:junit-jupiter-engine:${versions.junit5}", @@ -90,6 +103,7 @@ ext.libraries = [ ], kafkaClients : "org.apache.kafka:kafka-clients:${versions.kafkaVersion}", mantisShaded : "io.mantisrx:mantis-shaded:2.0.2", + mesos : "org.apache.mesos:mesos:${versions.mesosVersion}", mockitoAll : "org.mockito:mockito-all:${versions.mockito}", mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", @@ -189,4 +203,4 @@ subprojects { } } -apply from: file('baseline.gradle') +apply from: file('baseline.gradle') \ No newline at end of file diff --git a/mantis-control-plane/mantis-control-plane-core/build.gradle b/mantis-control-plane/mantis-control-plane-core/build.gradle index be4274b21..0ef73211b 100644 --- a/mantis-control-plane/mantis-control-plane-core/build.gradle +++ b/mantis-control-plane/mantis-control-plane-core/build.gradle @@ -15,34 +15,23 @@ */ apply plugin: 'java-test-fixtures' -ext { - - cliParserVersion = '1.1.1' - configMagicVersion = '0.11' - curatorVersion = '2.11.0' - hdrHistogramVersion = '2.+' - jodaTimeVersion = '2.+' - jsonVersion = '20180813' - mesosVersion = '1.7.2' - testngVersion = '6.14.+' -} dependencies { api project(":mantis-common") - api "org.skife.config:config-magic:$configMagicVersion" + api libraries.configMagic api libraries.flinkRpcApi api libraries.flinkRpcImpl api libraries.flinkCore - api "org.apache.mesos:mesos:$mesosVersion" - api "org.json:json:$jsonVersion" - api "org.hdrhistogram:HdrHistogram:$hdrHistogramVersion" - api "com.github.spullara.cli-parser:cli-parser:$cliParserVersion" - api "joda-time:joda-time:$jodaTimeVersion" + api libraries.mesos + api libraries.json + api libraries.hdrHistogram + api libraries.cliParser + api libraries.jodaTime testImplementation libraries.junit4 testImplementation libraries.mockitoAll -} +} \ No newline at end of file From 0140680061b294a3dd4c3dbca4f39a7cda08b009 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Tue, 28 Feb 2023 22:26:15 -0800 Subject: [PATCH 08/26] Refactor mantis-control-plane-server 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-control-plane-server and corresponding changes to root build.gradle (issue #345) --- build.gradle | 17 ++++++++ .../mantis-control-plane-server/build.gradle | 41 +++++++------------ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index 2850504a3..b2318e195 100644 --- a/build.gradle +++ b/build.gradle @@ -35,11 +35,14 @@ buildscript { } ext.versions = [ + akkaHttpVersion : '10.2.7', + akkaVersion : '2.6.15', archaiusVersion: "latest.release", avroVersion : "1.10.2", cliParserVersion : '1.1.1', configMagicVersion : '0.11', curatorVersion : '2.12.+', + fenzoVersion : '0.13.8', flink : "1.14.2", gsonVersion : "2.8.+", hadoop : "2.7.7", @@ -56,6 +59,8 @@ ext.versions = [ mockito3 : "3.+", nettyVersion : "4.1.34.Final", parquetVersion : "1.12.0", + rxJavaReactiveStreamsVersion : '1.+', + scalaBinaryVersion : '2.12', snappyVersion : "1.1.+", spectator: "1.3.+", slf4j : "1.7.0", @@ -64,6 +69,14 @@ 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}", + 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}", + 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}", asyncHttpClient: "org.asynchttpclient:async-http-client:2.12.3", @@ -72,6 +85,8 @@ ext.libraries = [ commonsLang3 : 'org.apache.commons:commons-lang3:3.5', configMagic : "org.skife.config:config-magic:${versions.configMagicVersion}", cliParser : "com.github.spullara.cli-parser:cli-parser:${versions.cliParserVersion}", + fenzoCore : "com.netflix.fenzo:fenzo-core:${versions.fenzoVersion}", + fenzoTriggers : "com.netflix.fenzo:fenzo-triggers:${versions.fenzoVersion}", flinkCore : "org.apache.flink:flink-core:${versions.flink}", flinkRpcApi : [ "org.apache.flink:flink-rpc-core:${versions.flink}", @@ -113,6 +128,7 @@ ext.libraries = [ nettyEpoll : "io.netty:netty-transport-native-epoll:${versions.nettyVersion}:linux-x86_64", parquetHadoop : "org.apache.parquet:parquet-hadoop:${versions.parquetVersion}", rxJava : "io.reactivex:rxjava:1.3.8", + rxJavaReactiveStreams : "io.reactivex:rxjava-reactive-streams:${versions.rxJavaReactiveStreamsVersion}", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", slf4jLog4j12 : "org.slf4j:slf4j-log4j12:${versions.slf4j}", @@ -120,6 +136,7 @@ ext.libraries = [ spectatorApi : "com.netflix.spectator:spectator-api:${versions.spectator}", spectatorApiv0 : "com.netflix.spectator:spectator-api:0.82.+", spotifyFutures : "com.spotify:completable-futures:0.3.1", + testng : "org.testng:testng:${versions.testngVersion}", vavr : "io.vavr:vavr:${versions.vavr}", vavrJackson : "io.vavr:vavr-jackson:${versions.vavr}", vavrTest : "io.vavr:vavr-test:${versions.vavr}", diff --git a/mantis-control-plane/mantis-control-plane-server/build.gradle b/mantis-control-plane/mantis-control-plane-server/build.gradle index 918b706fd..9f17873f8 100644 --- a/mantis-control-plane/mantis-control-plane-server/build.gradle +++ b/mantis-control-plane/mantis-control-plane-server/build.gradle @@ -16,42 +16,31 @@ apply plugin: 'application' -ext { - akkaVersion = '2.6.15' - akkaHttpVersion = '10.2.7' - fenzoVersion = '0.13.8' - cliParserVersion = '1.1.1' - configMagicVersion = '0.11' - rxJavaReactiveStreamsVersion = '1.+' - curatorVersion = '2.11.0' - testngVersion = '6.+' - scalaBinaryVersion = '2.12' -} dependencies { api project(':mantis-control-plane:mantis-control-plane-core') - api "com.typesafe.akka:akka-http_$scalaBinaryVersion:$akkaHttpVersion" - api "com.typesafe.akka:akka-http-jackson_$scalaBinaryVersion:$akkaHttpVersion" - api "com.typesafe.akka:akka-http-caching_$scalaBinaryVersion:$akkaHttpVersion" - api "com.typesafe.akka:akka-stream_$scalaBinaryVersion:$akkaVersion" - api "com.typesafe.akka:akka-slf4j_$scalaBinaryVersion:$akkaVersion" - api "com.typesafe.akka:akka-actor_$scalaBinaryVersion:$akkaVersion" + api libraries.akkaHttp + api libraries.akkaHttpJackson + api libraries.akkaHttpCaching + api libraries.akkaStream + api libraries.akkaSlf4j + api libraries.akkaActor - api "io.reactivex:rxjava-reactive-streams:$rxJavaReactiveStreamsVersion" - api "com.netflix.fenzo:fenzo-core:$fenzoVersion" - api "com.netflix.fenzo:fenzo-triggers:$fenzoVersion" - api "com.github.spullara.cli-parser:cli-parser:$cliParserVersion" - api "org.skife.config:config-magic:$configMagicVersion" + api libraries.rxJavaReactiveStreams + api libraries.fenzoCore + api libraries.fenzoTriggers + api libraries.cliParser + api libraries.configMagic // todo: separate worker entrypoint and move this to testImplementation instead. implementation libraries.spectatorApi - testImplementation "com.typesafe.akka:akka-testkit_$scalaBinaryVersion:$akkaVersion" - testImplementation "com.typesafe.akka:akka-http-testkit_$scalaBinaryVersion:$akkaHttpVersion" + testImplementation libraries.akkaTestkit + testImplementation libraries.akkaHttpTestkit testImplementation libraries.junit4 testImplementation libraries.mockitoCore3 - testImplementation "org.testng:testng:$testngVersion" + testImplementation libraries.testng testImplementation testFixtures(project(":mantis-common")) testImplementation testFixtures(project(":mantis-control-plane:mantis-control-plane-core")) testImplementation libraries.commonsIo @@ -65,4 +54,4 @@ run { test { maxParallelForks = 1 -} +} \ No newline at end of file From 8c5929d098f420e8a890ed42d54162b7b89f3dd0 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:11:19 -0800 Subject: [PATCH 09/26] 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 #345) --- build.gradle | 18 +++++++++++------- .../mantis-connector-iceberg/build.gradle | 7 ++----- .../mantis-control-plane-server/build.gradle | 2 -- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index b2318e195..dca2e9d0f 100644 --- 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 index 64cf26511..0e6d55251 100644 --- 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 index 9f17873f8..f11a152a1 100644 --- 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 From 34a352ee33f32297cb79370390b433ad03105670 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:44:41 -0800 Subject: [PATCH 10/26] Refactor mantis-network 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-network and corresponding changes to root build.gradle (issue #345) --- build.gradle | 3 +++ .../mantis-examples-synthetic-sourcejob/build.gradle | 2 +- mantis-network/build.gradle | 8 ++------ mantis-publish/mantis-publish-core/build.gradle | 2 +- mantis-source-jobs/mantis-source-job-kafka/build.gradle | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index dca2e9d0f..201d663de 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ ext.versions = [ mesosVersion : '1.7.2', mockito : "2.0.+", mockito3 : "3.+", + mqlVersion : '3.4.+', nettyVersion : "4.1.34.Final", parquetVersion : "1.12.0", rxJavaReactiveStreamsVersion : '1.+', @@ -127,9 +128,11 @@ ext.libraries = [ mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", mockneat : "net.andreinc:mockneat:0.4.8", + mqlJvm : "io.mantisrx:mql-jvm:${versions.mqlVersion}", nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", nettyEpoll : "io.netty:netty-transport-native-epoll:${versions.nettyVersion}:linux-x86_64", + nettyHandler : "io.netty:netty-handler:${versions.nettyVersion}", parquetHadoop : "org.apache.parquet:parquet-hadoop:${versions.parquetVersion}", rxJava : "io.reactivex:rxjava:1.3.8", rxJavaReactiveStreams : "io.reactivex:rxjava-reactive-streams:${versions.rxJavaReactiveStreamsVersion}", diff --git a/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle b/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle index 731da98b1..19fc7abab 100644 --- a/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle +++ b/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle @@ -15,7 +15,7 @@ */ ext { - mqlVersion = '3.2.2' + mqlVersion = '3.2.2' // todo: builds correctly, bump version later mockNeatVersion = '0.3.7' } diff --git a/mantis-network/build.gradle b/mantis-network/build.gradle index 006f068ed..deb16e0a1 100644 --- a/mantis-network/build.gradle +++ b/mantis-network/build.gradle @@ -14,14 +14,10 @@ * limitations under the License. */ -ext { - mqlVersion = '3.4.+' - nettyVersion = '4.1.17.Final' -} dependencies { - api "io.netty:netty-handler:$nettyVersion" - implementation "io.mantisrx:mql-jvm:$mqlVersion" + api libraries.nettyHandler + implementation libraries.mqlJvm api project(':mantis-common') compileOnly libraries.spectatorApi testImplementation libraries.spectatorApi diff --git a/mantis-publish/mantis-publish-core/build.gradle b/mantis-publish/mantis-publish-core/build.gradle index 0c5100c27..a30bb0355 100644 --- a/mantis-publish/mantis-publish-core/build.gradle +++ b/mantis-publish/mantis-publish-core/build.gradle @@ -16,7 +16,7 @@ ext { archaiusVersion = 'latest.release' versionMockito = '2.18.+' - mqlVersion = '3.2.2' + mqlVersion = '3.2.2' // todo: builds correctly, bump version later spectatorVersion = '0.134.0' } diff --git a/mantis-source-jobs/mantis-source-job-kafka/build.gradle b/mantis-source-jobs/mantis-source-job-kafka/build.gradle index bd6ff8b19..8a2aa2988 100644 --- a/mantis-source-jobs/mantis-source-job-kafka/build.gradle +++ b/mantis-source-jobs/mantis-source-job-kafka/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'mantis' ext { - mqlVersion = '3.2.2' + mqlVersion = '3.2.2' // todo: builds correctly, bump version later } dependencies { From 4926b28666ed59fc14027b9bb9165119386e1372 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:06:05 -0800 Subject: [PATCH 11/26] Refactor mantis-publish-core 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-publish-core and corresponding changes to root build.gradle. Name changes to make version vars consistent. (issue #345) --- build.gradle | 5 +++-- .../mantis-connector-kafka/build.gradle | 2 +- .../mantis-publish-core/build.gradle | 20 +++++++------------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 201d663de..e923c372a 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ ext.versions = [ junit5 : "5.4.+", kafkaVersion : "2.2.+", mesosVersion : '1.7.2', - mockito : "2.0.+", + mockito : "2.18.+", mockito3 : "3.+", mqlVersion : '3.4.+', nettyVersion : "4.1.34.Final", @@ -141,7 +141,8 @@ 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.+", + spectatorApi0 : "com.netflix.spectator:spectator-api:0.134.0", + spectatorExtIpc0: "com.netflix.spectator:spectator-ext-ipc:0.134.0", spotifyFutures : "com.spotify:completable-futures:0.3.1", testng : "org.testng:testng:${versions.testngVersion}", vavr : "io.vavr:vavr:${versions.vavr}", diff --git a/mantis-connectors/mantis-connector-kafka/build.gradle b/mantis-connectors/mantis-connector-kafka/build.gradle index 621acd4fd..12399cc71 100644 --- a/mantis-connectors/mantis-connector-kafka/build.gradle +++ b/mantis-connectors/mantis-connector-kafka/build.gradle @@ -24,7 +24,7 @@ dependencies { api libraries.kafkaClients api libraries.rxJava - api libraries.spectatorApiv0 + api libraries.spectatorApi0 api libraries.archaius2Api api libraries.archaius2Core diff --git a/mantis-publish/mantis-publish-core/build.gradle b/mantis-publish/mantis-publish-core/build.gradle index a30bb0355..e8baa2ea2 100644 --- a/mantis-publish/mantis-publish-core/build.gradle +++ b/mantis-publish/mantis-publish-core/build.gradle @@ -13,26 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -ext { - archaiusVersion = 'latest.release' - versionMockito = '2.18.+' - mqlVersion = '3.2.2' // todo: builds correctly, bump version later - spectatorVersion = '0.134.0' -} dependencies { - implementation "io.mantisrx:mql-jvm:$mqlVersion" + implementation libraries.mqlJvm implementation project(":mantis-common-serde") api project(":mantis-discovery-proto") - api "com.netflix.spectator:spectator-api:$spectatorVersion" - implementation "com.netflix.spectator:spectator-ext-ipc:$spectatorVersion" + api libraries.spectatorApi0 + implementation libraries.spectatorExtIpc0 - api "com.netflix.archaius:archaius2-api:$archaiusVersion" - implementation "com.netflix.archaius:archaius2-core:$archaiusVersion" + api libraries.archaius2Api + implementation libraries.archaius2Core - testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0" - testCompileOnly "com.netflix.archaius:archaius2-core:$archaiusVersion" + testImplementation libraries.wiremock + testCompileOnly libraries.archaius2Core implementation libraries.slf4jApi From a5a1161de52a2a79a020c819c23dbcf7b0677312 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:14:21 -0800 Subject: [PATCH 12/26] Refactor mantis-publish-netty 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-publish-netty and corresponding changes to root build.gradle. tbd about shadowjar (issue #345) --- build.gradle | 4 +++- mantis-publish/mantis-publish-netty/build.gradle | 11 +++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index e923c372a..2f9a32dbf 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ ext.versions = [ rxJavaReactiveStreamsVersion : '1.+', scalaBinaryVersion : '2.12', snappyVersion : "1.1.+", - spectator: "1.3.+", + spectator: "latest.release", slf4j : "1.7.0", testngVersion : '6.14.+', vavr : "0.9.2", @@ -129,6 +129,7 @@ ext.libraries = [ mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", mockneat : "net.andreinc:mockneat:0.4.8", mqlJvm : "io.mantisrx:mql-jvm:${versions.mqlVersion}", + nettyAll : "io.netty:netty-all:${versions.nettyVersion}", nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", nettyEpoll : "io.netty:netty-transport-native-epoll:${versions.nettyVersion}:linux-x86_64", @@ -141,6 +142,7 @@ 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}", + 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", spotifyFutures : "com.spotify:completable-futures:0.3.1", diff --git a/mantis-publish/mantis-publish-netty/build.gradle b/mantis-publish/mantis-publish-netty/build.gradle index cd6d7420e..5f1f106f4 100644 --- a/mantis-publish/mantis-publish-netty/build.gradle +++ b/mantis-publish/mantis-publish-netty/build.gradle @@ -15,18 +15,13 @@ */ apply plugin: 'com.github.johnrengelman.shadow' -ext { - archaiusVersion = 'latest.release' - spectatorVersion = 'latest.release' - nettyVersion = '4.1.34.Final' -} dependencies { implementation project(':mantis-publish:mantis-publish-core') - implementation "io.netty:netty-all:$nettyVersion" + implementation libraries.nettyAll - implementation "com.netflix.spectator:spectator-ext-ipc:$spectatorVersion" - implementation "com.netflix.archaius:archaius2-core:$archaiusVersion" + implementation libraries.spectatorExtIpc + implementation libraries.archaius2Core implementation libraries.slf4jApi 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 13/26] 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 From 60d8cf27773d52faa145efc460b30f902e8a108b Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 16:33:56 -0800 Subject: [PATCH 14/26] Refactor mantis-remote-observable 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-remote-observable and corresponding changes to root build.gradle. (issue #345) --- build.gradle | 2 ++ mantis-remote-observable/build.gradle | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b9c561885..89e24b5be 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,7 @@ ext.versions = [ mqlVersion : '3.4.+', nettyVersion : "4.1.34.Final", parquetVersion : "1.12.0", + rxJavaMathVersion : "0.20.6", rxJavaReactiveStreamsVersion : '1.+', scalaBinaryVersion : '2.12', snappyVersion : "1.1.+", @@ -139,6 +140,7 @@ ext.libraries = [ nettyHandler : "io.netty:netty-handler:${versions.nettyVersion}", parquetHadoop : "org.apache.parquet:parquet-hadoop:${versions.parquetVersion}", rxJava : "io.reactivex:rxjava:1.3.8", + rxJavaMath : "com.netflix.rxjava:rxjava-math:${versions.rxJavaMathVersion}", rxJavaReactiveStreams : "io.reactivex:rxjava-reactive-streams:${versions.rxJavaReactiveStreamsVersion}", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", diff --git a/mantis-remote-observable/build.gradle b/mantis-remote-observable/build.gradle index fd54815bd..a758641ad 100644 --- a/mantis-remote-observable/build.gradle +++ b/mantis-remote-observable/build.gradle @@ -14,10 +14,6 @@ * limitations under the License. */ -ext { - nettyVersion = '4.1.17.Final' - rxJavaMathVersion = '0.20.6' -} test { exclude 'io/reactivex/mantis/remote/observable/**' // exclude remote observable tests that require ports @@ -25,8 +21,8 @@ test { dependencies { implementation project(':mantis-common') - implementation "io.netty:netty-handler:$nettyVersion" - implementation("com.netflix.rxjava:rxjava-math:$rxJavaMathVersion") { + implementation libraries.nettyHandler + implementation(libraries.rxJavaMath) { exclude module: 'rxjava-core' } implementation libraries.slf4jApi From 42e0ccb183bc3d227435a5aa893618774a1d71b0 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:33:04 -0800 Subject: [PATCH 15/26] Refactor mantis-server-worker 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-server-worker and corresponding changes to root build.gradle. tbd for lines 31,32 - exclude (issue #345) --- build.gradle | 7 +++++++ .../mantis-server-worker/build.gradle | 18 ++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 89e24b5be..f19a330f5 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ ext.versions = [ guiceVersion : "4.2.2", hadoop : "2.7.7", hdrHistogramVersion : '2.+', + httpComponentsVersion : '4.5.6', icebergVersion : "0.14.+", jctoolsVersion : "1.+", jodaTimeVersion : '2.+', @@ -55,6 +56,7 @@ ext.versions = [ junit4 : "4.11", junit5 : "5.4.+", kafkaVersion : "2.2.+", + mantisRxControlVersion : '1.3.+', mesosVersion : '1.7.2', mockito : "2.18.+", mockito3 : "3.+", @@ -109,7 +111,9 @@ ext.libraries = [ hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", hamcrest : "org.hamcrest:hamcrest-core:1.3", + hamcrestAll : 'org.hamcrest:hamcrest-all:1.3', hdrHistogram : "org.hdrhistogram:HdrHistogram:${versions.hdrHistogramVersion}", + httpClient : "org.apache.httpcomponents:httpclient:${versions.httpComponentsVersion}", iceberg : [ "org.apache.iceberg:iceberg-api:${versions.icebergVersion}", "org.apache.iceberg:iceberg-core:${versions.icebergVersion}", @@ -127,7 +131,9 @@ ext.libraries = [ ], kafkaClients : "org.apache.kafka:kafka-clients:${versions.kafkaVersion}", mantisShaded : "io.mantisrx:mantis-shaded:2.0.2", + mantisRxControl: "io.mantisrx:mantis-rxcontrol:${versions.mantisRxControlVersion}", mesos : "org.apache.mesos:mesos:${versions.mesosVersion}", + moa : "nz.ac.waikato.cms.moa:moa:2017.06", mockitoAll : "org.mockito:mockito-all:${versions.mockito}", mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", @@ -143,6 +149,7 @@ ext.libraries = [ rxJavaMath : "com.netflix.rxjava:rxjava-math:${versions.rxJavaMathVersion}", rxJavaReactiveStreams : "io.reactivex:rxjava-reactive-streams:${versions.rxJavaReactiveStreamsVersion}", rxNettyShaded : "com.netflix:mantis-rxnetty:0.4.19.1", + sketchesCore : "com.yahoo.datasketches:sketches-core:0.9.1", slf4jApi : "org.slf4j:slf4j-api:${versions.slf4j}", slf4jLog4j12 : "org.slf4j:slf4j-log4j12:${versions.slf4j}", snappyJava : "org.xerial.snappy:snappy-java:${versions.snappyVersion}", diff --git a/mantis-server/mantis-server-worker/build.gradle b/mantis-server/mantis-server-worker/build.gradle index e1678ac5d..cf677efd2 100644 --- a/mantis-server/mantis-server-worker/build.gradle +++ b/mantis-server/mantis-server-worker/build.gradle @@ -16,12 +16,6 @@ apply plugin: 'eu.appsatori.fatjar' -ext { - mantisRxControlVersion = '1.3.+' - mesosVersion = '1.7.2' - httpComponentsVersion = '4.5.6' - curatorVersion = '2.11.0' -} dependencies { api project(":mantis-runtime") @@ -29,23 +23,23 @@ dependencies { api project(":mantis-server:mantis-server-worker-client") api project(":mantis-server:mantis-server-agent") - implementation "org.apache.mesos:mesos:$mesosVersion" + implementation libraries.mesos implementation libraries.slf4jApi implementation libraries.slf4jLog4j12 implementation libraries.vavr - implementation('nz.ac.waikato.cms.moa:moa:2017.06') { + implementation(libraries.moa) { exclude group: 'com.github.spullara.cli-parser', module: 'cli-parser' exclude group: 'org.pentaho.pentaho-commons', module: 'pentaho-package-manager' } - implementation "org.apache.httpcomponents:httpclient:$httpComponentsVersion" - implementation "io.mantisrx:mantis-rxcontrol:$mantisRxControlVersion" - implementation "com.yahoo.datasketches:sketches-core:0.9.1" + implementation libraries.httpClient + implementation libraries.mantisRxControl + implementation libraries.sketchesCore implementation libraries.spectatorApi testImplementation libraries.junit4 testImplementation libraries.mockitoAll - testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation libraries.hamcrestAll testImplementation libraries.vavrTest testImplementation(testFixtures(project(":mantis-common"))) testImplementation(testFixtures(project(":mantis-control-plane:mantis-control-plane-core"))) From 1ddb23ddcbbb06a6c36e9a66e5028b74deb34594 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:33:35 -0800 Subject: [PATCH 16/26] Refactor mantis-server-worker-client 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-server-worker-client and corresponding changes to root build.gradle. (issue #345) --- mantis-server/mantis-server-worker-client/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mantis-server/mantis-server-worker-client/build.gradle b/mantis-server/mantis-server-worker-client/build.gradle index b87ceea4e..7be9cdf85 100644 --- a/mantis-server/mantis-server-worker-client/build.gradle +++ b/mantis-server/mantis-server-worker-client/build.gradle @@ -21,5 +21,5 @@ dependencies { testImplementation libraries.junit4 testImplementation libraries.mockitoAll testImplementation libraries.spectatorApi - testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation libraries.hamcrestAll } From 3f1770becb9f6b6fafeb13720c2583274dec992e Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:58:31 -0800 Subject: [PATCH 17/26] Refactor mantis-shaded 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-shaded and corresponding changes to root build.gradle. tbd - issue #194 and grouping (issue #345) --- build.gradle | 25 ++++++++++++++++++++++++ mantis-shaded/build.gradle | 39 +++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index f19a330f5..8cfb4ba87 100644 --- a/build.gradle +++ b/build.gradle @@ -45,12 +45,16 @@ ext.versions = [ fenzoVersion : '0.13.8', flink : "1.14.2", gsonVersion : "2.8.+", + guavaFailureAccessVersion : '1.0.1', + guavaVersion : '31.1-jre', guiceVersion : "4.2.2", hadoop : "2.7.7", hdrHistogramVersion : '2.+', httpComponentsVersion : '4.5.6', icebergVersion : "0.14.+", + jacksonVersion : '2.12.+', jctoolsVersion : "1.+", + jlineVersion : '0.9.94', jodaTimeVersion : '2.+', jsonVersion : '20180813', junit4 : "4.11", @@ -61,6 +65,7 @@ ext.versions = [ mockito : "2.18.+", mockito3 : "3.+", mqlVersion : '3.4.+', + nettyVersion3 : '3.7.0.Final', nettyVersion : "4.1.34.Final", parquetVersion : "1.12.0", rxJavaMathVersion : "0.20.6", @@ -71,6 +76,7 @@ ext.versions = [ slf4j : "1.7.0", testngVersion : '6.14.+', vavr : "0.9.2", + zookeeperVersion : '3.4.+', ] ext.libraries = [ @@ -93,6 +99,12 @@ ext.libraries = [ commonsLang3 : 'org.apache.commons:commons-lang3:3.5', configMagic : "org.skife.config:config-magic:${versions.configMagicVersion}", cliParser : "com.github.spullara.cli-parser:cli-parser:${versions.cliParserVersion}", + curator : [ + "org.apache.curator:curator-recipes:${versions.curatorVersion}", + "org.apache.curator:curator-framework:${versions.curatorVersion}", + "org.apache.curator:curator-client:${versions.curatorVersion}", + ], + failureaccess : "com.google.guava:failureaccess:${versions.guavaFailureAccessVersion}", fenzoCore : "com.netflix.fenzo:fenzo-core:${versions.fenzoVersion}", fenzoTriggers : "com.netflix.fenzo:fenzo-triggers:${versions.fenzoVersion}", flinkCore : "org.apache.flink:flink-core:${versions.flink}", @@ -107,6 +119,7 @@ ext.libraries = [ "junit:junit-dep:${versions.junit4}", ], gson : "com.google.code.gson:gson:${versions.gsonVersion}", + guava : "com.google.guava:guava:${versions.guavaVersion}", guice : "com.google.inject:guice:${versions.guiceVersion}", hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", @@ -120,8 +133,18 @@ ext.libraries = [ "org.apache.iceberg:iceberg-data:${versions.icebergVersion}", "org.apache.iceberg:iceberg-parquet:${versions.icebergVersion}", ], + jackson : [ + "com.fasterxml.jackson.core:jackson-annotations:${versions.jacksonVersion}", + "com.fasterxml.jackson.core:jackson-core:${versions.jacksonVersion}", + "com.fasterxml.jackson.core:jackson-databind:${versions.jacksonVersion}", + "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${versions.jacksonVersion}", + ], + jacksonDatatypeJsr310 : "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jacksonVersion}", + jacksonModuleAfterburner : "com.fasterxml.jackson.module:jackson-module-afterburner:${versions.jacksonVersion}", + jacksonDataformatCbor : "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jacksonVersion}", jcip : "net.jcip:jcip-annotations:1.0", jctools : "org.jctools:jctools-core:${versions.jctoolsVersion}", + jline : "jline:jline:${versions.jlineVersion}", jodaTime : "joda-time:joda-time:${versions.jodaTimeVersion}", json : "org.json:json:${versions.jsonVersion}", junitJupiter : [ @@ -139,6 +162,7 @@ ext.libraries = [ mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", mockneat : "net.andreinc:mockneat:0.4.8", mqlJvm : "io.mantisrx:mql-jvm:${versions.mqlVersion}", + netty : "io.netty:netty:${versions.nettyVersion}", nettyAll : "io.netty:netty-all:${versions.nettyVersion}", nettyBuffer : "io.netty:netty-buffer:${versions.nettyVersion}", nettyCodec : "io.netty:netty-codec-http:${versions.nettyVersion}", @@ -165,6 +189,7 @@ ext.libraries = [ vavrTest : "io.vavr:vavr-test:${versions.vavr}", wiremock : "com.github.tomakehurst:wiremock-jre8:2.21.0", zip4j : "net.lingala.zip4j:zip4j:2.9.0", + zookeeper : "org.apache.zookeeper:zookeeper:${versions.zookeeperVersion}" ] allprojects { diff --git a/mantis-shaded/build.gradle b/mantis-shaded/build.gradle index 6e43b5036..7ccf87bd0 100644 --- a/mantis-shaded/build.gradle +++ b/mantis-shaded/build.gradle @@ -25,13 +25,13 @@ apply plugin: 'com.github.johnrengelman.shadow' * On the second publish, you update all subprojects that depend on mantis-shaded */ ext { - jacksonVersion = '2.12.+' - guavaFailureAccessVersion = '1.0.1' - guavaVersion = '31.1-jre' - curatorVersion = '2.12.+' - zookeeperVersion = '3.4.+' - jlineVersion = '0.9.94' - nettyVersion = '3.7.0.Final' + // jacksonVersion = '2.12.+' + // guavaFailureAccessVersion = '1.0.1' + // guavaVersion = '31.1-jre' + // curatorVersion = '2.12.+' + // zookeeperVersion = '3.4.+' + // jlineVersion = '0.9.94' + // nettyVersion = '3.7.0.Final' } configurations { @@ -43,26 +43,21 @@ configurations { dependencies { // Libraries to be shaded. Add their dependencies that do not need to be shaded as 'implementation' dependencies - shaded "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" - shaded "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" - shaded "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" - shaded "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion" + shaded libraries.jackson // TODO(sundaram): This can only be added when we can get rid of all ObjectMappers spilled throughout the codebase // as the absence of this change would mean Instant for instance cannot be serialized by the existing ObjectMappers. // @see Github issue describing the ObjectMapper problem - shaded "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion" - shaded "com.fasterxml.jackson.module:jackson-module-afterburner:$jacksonVersion" - shaded "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:$jacksonVersion" + shaded libraries.jacksonDatatypeJsr310 + shaded libraries.jacksonModuleAfterburner + shaded libraries.jacksonDataformatCbor shaded libraries.vavrJackson - shaded "com.google.guava:guava:$guavaVersion" - shaded "com.google.guava:failureaccess:$guavaFailureAccessVersion" - shaded "org.apache.curator:curator-recipes:$curatorVersion" - shaded "org.apache.curator:curator-framework:$curatorVersion" - shaded "org.apache.curator:curator-client:$curatorVersion" - shaded "org.apache.zookeeper:zookeeper:$zookeeperVersion" - shaded "jline:jline:$jlineVersion" - shaded "io.netty:netty:$nettyVersion" + shaded libraries.guava + shaded libraries.failureaccess + shaded libraries.curator + shaded libraries.zookeeper + shaded libraries.jline + shaded libraries.netty implementation libraries.vavr } From ee2a3b44080aaf72a9e7d08aecfd613f07fcb2ea Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:01:40 -0800 Subject: [PATCH 18/26] Refactor mantis-source-job-kafka 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-source-job-kafka. (issue #345) --- mantis-source-jobs/mantis-source-job-kafka/build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mantis-source-jobs/mantis-source-job-kafka/build.gradle b/mantis-source-jobs/mantis-source-job-kafka/build.gradle index 8a2aa2988..1b272cb1d 100644 --- a/mantis-source-jobs/mantis-source-job-kafka/build.gradle +++ b/mantis-source-jobs/mantis-source-job-kafka/build.gradle @@ -15,13 +15,10 @@ */ apply plugin: 'mantis' -ext { - mqlVersion = '3.2.2' // todo: builds correctly, bump version later -} dependencies { implementation project(":mantis-runtime") implementation project(":mantis-connectors:mantis-connector-kafka") - implementation "io.mantisrx:mql-jvm:$mqlVersion" + implementation libraries.mqlJvm } From 4a44dfc8b7a081e0ec1bef4aee0c1fe67be2e4e7 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:07:21 -0800 Subject: [PATCH 19/26] Refactor mantis-examples-groupby-sample 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-groupby-sample. (issue #345) --- mantis-examples/mantis-examples-groupby-sample/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mantis-examples/mantis-examples-groupby-sample/build.gradle b/mantis-examples/mantis-examples-groupby-sample/build.gradle index 42bcdf0ac..5e9c4f8a1 100644 --- a/mantis-examples/mantis-examples-groupby-sample/build.gradle +++ b/mantis-examples/mantis-examples-groupby-sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library' configurations.all { resolutionStrategy { - force "com.google.guava:guava:31.1-jre" + force libraries.guava } } @@ -14,7 +14,7 @@ task execute(type: JavaExec) { dependencies { implementation project(':mantis-runtime') - implementation "com.netflix.spectator:spectator-api:1.3.+" + implementation libraries.spectatorApi implementation libraries.mockneat implementation libraries.slf4jApi From f74ba905320ff8f288c2c91022e8ae7456416555 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:10:34 -0800 Subject: [PATCH 20/26] Refactor mantis-examples-jobconnector-sample 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-jobconnector-sample and corresponding changes to root build.gradle (issue #345) --- build.gradle | 2 ++ .../mantis-examples-jobconnector-sample/build.gradle | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 8cfb4ba87..c70c8ff77 100644 --- a/build.gradle +++ b/build.gradle @@ -60,6 +60,7 @@ ext.versions = [ junit4 : "4.11", junit5 : "5.4.+", kafkaVersion : "2.2.+", + mantisConnectorsVersion : '1.2.5', mantisRxControlVersion : '1.3.+', mesosVersion : '1.7.2', mockito : "2.18.+", @@ -153,6 +154,7 @@ ext.libraries = [ "org.junit.jupiter:junit-jupiter-params:${versions.junit5}", ], kafkaClients : "org.apache.kafka:kafka-clients:${versions.kafkaVersion}", + mantisConnectorJob : "io.mantisrx:mantis-connector-job:${versions.mantisConnectorsVersion}", mantisShaded : "io.mantisrx:mantis-shaded:2.0.2", mantisRxControl: "io.mantisrx:mantis-rxcontrol:${versions.mantisRxControlVersion}", mesos : "org.apache.mesos:mesos:${versions.mesosVersion}", diff --git a/mantis-examples/mantis-examples-jobconnector-sample/build.gradle b/mantis-examples/mantis-examples-jobconnector-sample/build.gradle index 57d9e2d14..e405bd771 100644 --- a/mantis-examples/mantis-examples-jobconnector-sample/build.gradle +++ b/mantis-examples/mantis-examples-jobconnector-sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library' configurations.all { resolutionStrategy { - force "com.google.guava:guava:31.1-jre" + force libraries.guava } } @@ -12,15 +12,12 @@ task execute(type: JavaExec) { classpath = sourceSets.main.runtimeClasspath } -ext { - mantisConnectorsVersion = '1.2.5' -} dependencies { api libraries.mantisShaded implementation project(':mantis-runtime') - implementation "io.mantisrx:mantis-connector-job:$mantisConnectorsVersion" + implementation libraries.mantisConnectorJob implementation libraries.slf4jApi implementation libraries.slf4jLog4j12 From bc0ad9656372a13d34f98282253502ae3168dd54 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:16:01 -0800 Subject: [PATCH 21/26] Refactor mantis-examples-mantis-publish-sample 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-mantis-publish-sample and corresponding changes to root build.gradle (issue #345) --- build.gradle | 4 +++- .../build.gradle | 16 +++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index c70c8ff77..6ba58d908 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,7 @@ ext.versions = [ mesosVersion : '1.7.2', mockito : "2.18.+", mockito3 : "3.+", + mockNeatVersion : '0.4.8', mqlVersion : '3.4.+', nettyVersion3 : '3.7.0.Final', nettyVersion : "4.1.34.Final", @@ -162,7 +163,7 @@ ext.libraries = [ mockitoAll : "org.mockito:mockito-all:${versions.mockito}", mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", - mockneat : "net.andreinc:mockneat:0.4.8", + mockneat : "net.andreinc:mockneat:${versions.mockneatVersion}", mqlJvm : "io.mantisrx:mql-jvm:${versions.mqlVersion}", netty : "io.netty:netty:${versions.nettyVersion}", nettyAll : "io.netty:netty-all:${versions.nettyVersion}", @@ -184,6 +185,7 @@ ext.libraries = [ 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}", + spectatorPlugin0: "com.netflix.spectator:spectator-nflx-plugin:0.134.0", spotifyFutures : "com.spotify:completable-futures:0.3.1", testng : "org.testng:testng:${versions.testngVersion}", vavr : "io.vavr:vavr:${versions.vavr}", diff --git a/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle b/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle index e14f736c9..c42ef034a 100644 --- a/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle +++ b/mantis-examples/mantis-examples-mantis-publish-sample/build.gradle @@ -45,23 +45,17 @@ application { mainClassName = 'com.netflix.mantis.examples.mantispublishsample.Application' } -ext { - guiceVersion = '4.2.2' - spectatorVersion = '0.96.0' - archaiusVersion = 'latest.release' - mockNeatVersion = '0.4.8' -} dependencies { implementation project(":mantis-publish:mantis-publish-netty-guice") implementation libraries.rxJava - 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.spectatorPlugin0 implementation libraries.mockneat implementation libraries.slf4jLog4j12 From d90bad4fe88ef30228506112879ed38c423b8119 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:37:43 -0800 Subject: [PATCH 22/26] Refactor mantis-examples-mantis-publish-web-sample 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-mantis-publish-web-sample and corresponding changes to root build.gradle (issue #345) --- build.gradle | 5 ++++- .../build.gradle | 21 +++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 6ba58d908..9742dfbf4 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ ext.versions = [ guavaFailureAccessVersion : '1.0.1', guavaVersion : '31.1-jre', guiceVersion : "4.2.2", + guiceServletVersion : '4.0', hadoop : "2.7.7", hdrHistogramVersion : '2.+', httpComponentsVersion : '4.5.6', @@ -123,10 +124,11 @@ ext.libraries = [ gson : "com.google.code.gson:gson:${versions.gsonVersion}", guava : "com.google.guava:guava:${versions.guavaVersion}", guice : "com.google.inject:guice:${versions.guiceVersion}", + guiceServlet : "com.google.inject.extensions:guice-servlet:${versions.guiceServletVersion}", hadoopCommon : "org.apache.hadoop:hadoop-common:${versions.hadoop}", hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", hamcrest : "org.hamcrest:hamcrest-core:1.3", - hamcrestAll : 'org.hamcrest:hamcrest-all:1.3', + hamcrestAll : "org.hamcrest:hamcrest-all:1.3", hdrHistogram : "org.hdrhistogram:HdrHistogram:${versions.hdrHistogramVersion}", httpClient : "org.apache.httpcomponents:httpclient:${versions.httpComponentsVersion}", iceberg : [ @@ -144,6 +146,7 @@ ext.libraries = [ jacksonDatatypeJsr310 : "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jacksonVersion}", jacksonModuleAfterburner : "com.fasterxml.jackson.module:jackson-module-afterburner:${versions.jacksonVersion}", jacksonDataformatCbor : "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jacksonVersion}", + javaxServletApi: "javax.servlet:javax.servlet-api:3.1.0", jcip : "net.jcip:jcip-annotations:1.0", jctools : "org.jctools:jctools-core:${versions.jctoolsVersion}", jline : "jline:jline:${versions.jlineVersion}", diff --git a/mantis-examples/mantis-examples-mantis-publish-web-sample/build.gradle b/mantis-examples/mantis-examples-mantis-publish-web-sample/build.gradle index 249e21ced..2d1b8e272 100644 --- a/mantis-examples/mantis-examples-mantis-publish-web-sample/build.gradle +++ b/mantis-examples/mantis-examples-mantis-publish-web-sample/build.gradle @@ -30,25 +30,18 @@ plugins { } -ext { - - guiceVersion = '4.2.2' - spectatorVersion = '0.96.0' - archaiusVersion = 'latest.release' - guiceServletVersion = '4.0' -} dependencies { compile project(":mantis-publish:mantis-publish-netty-guice") - providedCompile 'javax.servlet:javax.servlet-api:3.1.0' - 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" + providedCompile libraries.javaxServletApi + implementation libraries.spectatorExtIpc0 + implementation libraries.archaius2Core + implementation libraries.archaius2Guice + implementation libraries.guice + implementation libraries.spectatorPlugin0 implementation libraries.slf4jLog4j12 - compile 'com.google.inject.extensions:guice-servlet:4.0' + compile libraries.guiceServlet } From 30a65cecc89708fec625af90ac4ae7918186fa4a Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:47:00 -0800 Subject: [PATCH 23/26] Refactor mantis-examples-sine-function 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-sine-function and corresponding changes to root build.gradle (issue #345) --- mantis-examples/mantis-examples-sine-function/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mantis-examples/mantis-examples-sine-function/build.gradle b/mantis-examples/mantis-examples-sine-function/build.gradle index 8b4f4e4e9..cf2f012b8 100644 --- a/mantis-examples/mantis-examples-sine-function/build.gradle +++ b/mantis-examples/mantis-examples-sine-function/build.gradle @@ -16,7 +16,7 @@ configurations.all { resolutionStrategy { - force "com.google.guava:guava:31.1-jre" + force libraries.guava } } task execute(type:JavaExec) { @@ -27,5 +27,5 @@ task execute(type:JavaExec) { } dependencies { implementation project(':mantis-runtime') - implementation "com.netflix.spectator:spectator-api:1.3.+" + implementation libraries.spectatorApi } From 720f4cdcf2ca7ffed1c08a7366f201793229fa2a Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:47:58 -0800 Subject: [PATCH 24/26] Refactor mantis-examples-synthetic-sourcejob 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-synthetic-sourcejob and corresponding changes to root build.gradle (issue #345) --- build.gradle | 2 ++ .../mantis-examples-synthetic-sourcejob/build.gradle | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9742dfbf4..a27d22c1f 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,7 @@ ext.versions = [ mantisRxControlVersion : '1.3.+', mesosVersion : '1.7.2', mockito : "2.18.+", + mockito1 : "1.9.5", mockito3 : "3.+", mockNeatVersion : '0.4.8', mqlVersion : '3.4.+', @@ -164,6 +165,7 @@ ext.libraries = [ mesos : "org.apache.mesos:mesos:${versions.mesosVersion}", moa : "nz.ac.waikato.cms.moa:moa:2017.06", mockitoAll : "org.mockito:mockito-all:${versions.mockito}", + mockitoAll1 : "org.mockito:mockito-all:${versions.mockito1}", mockitoCore : "org.mockito:mockito-core:${versions.mockito}", mockitoCore3 : "org.mockito:mockito-core:${versions.mockito3}", mockneat : "net.andreinc:mockneat:${versions.mockneatVersion}", diff --git a/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle b/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle index 19fc7abab..424604d0f 100644 --- a/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle +++ b/mantis-examples/mantis-examples-synthetic-sourcejob/build.gradle @@ -14,10 +14,6 @@ * limitations under the License. */ -ext { - mqlVersion = '3.2.2' // todo: builds correctly, bump version later - mockNeatVersion = '0.3.7' -} task execute(type: JavaExec) { main = "io.mantisrx.sourcejob.synthetic.SyntheticSourceJob" @@ -28,11 +24,11 @@ task execute(type: JavaExec) { dependencies { implementation project(':mantis-runtime') - implementation "io.mantisrx:mql-jvm:$mqlVersion" + implementation libraries.mqlJvm implementation libraries.mockneat implementation libraries.slf4jApi implementation libraries.slf4jLog4j12 - testImplementation "org.mockito:mockito-all:1.9.5" + testImplementation libraries.mockitoAll1 } From 4c82455059811300ec946141ad9d5813505cf7b7 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:54:44 -0800 Subject: [PATCH 25/26] Refactor mantis-examples-twitter-sample 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-twitter-sample and corresponding changes to root build.gradle (issue #345) --- build.gradle | 3 ++- .../mantis-examples-twitter-sample/build.gradle | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index a27d22c1f..aab1d0e76 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ ext.versions = [ guiceServletVersion : '4.0', hadoop : "2.7.7", hdrHistogramVersion : '2.+', - httpComponentsVersion : '4.5.6', + httpComponentsVersion : '4.5.9', icebergVersion : "0.14.+", jacksonVersion : '2.12.+', jctoolsVersion : "1.+", @@ -130,6 +130,7 @@ ext.libraries = [ hadoopS3 : "org.apache.hadoop:hadoop-aws:${versions.hadoop}", hamcrest : "org.hamcrest:hamcrest-core:1.3", hamcrestAll : "org.hamcrest:hamcrest-all:1.3", + hbcCore : "com.twitter:hbc-core:2.2.0", hdrHistogram : "org.hdrhistogram:HdrHistogram:${versions.hdrHistogramVersion}", httpClient : "org.apache.httpcomponents:httpclient:${versions.httpComponentsVersion}", iceberg : [ diff --git a/mantis-examples/mantis-examples-twitter-sample/build.gradle b/mantis-examples/mantis-examples-twitter-sample/build.gradle index 80b16c183..677b0bf43 100644 --- a/mantis-examples/mantis-examples-twitter-sample/build.gradle +++ b/mantis-examples/mantis-examples-twitter-sample/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'java-library' configurations.all { resolutionStrategy { - force "com.google.guava:guava:31.1-jre" - force "org.apache.httpcomponents:httpclient:4.5.9" + force libraries.guava + force libraries.httpClient } } @@ -15,8 +15,8 @@ task execute(type: JavaExec) { dependencies { implementation project(':mantis-runtime') - implementation "com.netflix.spectator:spectator-api:1.3.+" - implementation 'com.twitter:hbc-core:2.2.0' + implementation libraries.spectatorApi + implementation libraries.hbcCore implementation libraries.slf4jApi implementation libraries.slf4jLog4j12 From 100f073308fceda4c7621bcafc03c2be5e75e912 Mon Sep 17 00:00:00 2001 From: Mabel <70232089+mabelbot@users.noreply.github.com> Date: Wed, 1 Mar 2023 19:00:40 -0800 Subject: [PATCH 26/26] Refactor mantis-examples-wordcount 3rd party dependency specifications first pass at refactor 3rd party dependency specifications for mantis-examples-wordcount and corresponding changes to root build.gradle (issue #345) --- mantis-examples/mantis-examples-wordcount/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mantis-examples/mantis-examples-wordcount/build.gradle b/mantis-examples/mantis-examples-wordcount/build.gradle index 1a3c48406..3a3ab6f00 100644 --- a/mantis-examples/mantis-examples-wordcount/build.gradle +++ b/mantis-examples/mantis-examples-wordcount/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'java-library' configurations.all { resolutionStrategy { - force "com.google.guava:guava:31.1-jre" - force "org.apache.httpcomponents:httpclient:4.5.9" + force libraries.guava + force libraries.httpClient } } @@ -16,8 +16,8 @@ task execute(type: JavaExec) { dependencies { implementation project(':mantis-runtime') implementation project(':mantis-examples:mantis-examples-core') - implementation "com.netflix.spectator:spectator-api:1.3.+" - implementation 'com.twitter:hbc-core:2.2.0' + implementation libraries.spectatorApi + implementation libraries.hbcCore implementation libraries.slf4jApi implementation libraries.slf4jLog4j12