From 89aae93e6063948479ce3f55db1957eedbb3562e Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Thu, 23 May 2024 14:20:01 +0200 Subject: [PATCH] (*) Lift jetty and guava-dependencies --- code/common/config/build.gradle | 5 ++++- code/common/db/build.gradle | 5 ++++- code/common/linkdb/build.gradle | 5 ++++- code/common/model/build.gradle | 5 ++++- code/common/process/build.gradle | 5 ++++- code/common/renderer/build.gradle | 10 ++++++++-- code/common/service/build.gradle | 20 ++++++++++++++++--- code/execution/api/build.gradle | 14 +++++++++++-- code/execution/build.gradle | 20 ++++++++++++++++--- code/features-convert/adblock/build.gradle | 5 ++++- .../anchor-keywords/build.gradle | 5 ++++- .../data-extractors/build.gradle | 5 ++++- .../keyword-extraction/build.gradle | 5 ++++- code/features-convert/pubdate/build.gradle | 5 ++++- .../features-convert/reddit-json/build.gradle | 5 ++++- .../stackexchange-xml/build.gradle | 5 ++++- .../summary-extraction/build.gradle | 5 ++++- .../topic-detection/build.gradle | 5 ++++- .../crawl-blocklist/build.gradle | 5 ++++- code/features-crawl/link-parser/build.gradle | 5 ++++- .../random-websites/build.gradle | 5 ++++- code/features-search/screenshots/build.gradle | 10 ++++++++-- code/functions/domain-info/api/build.gradle | 14 +++++++++++-- code/functions/domain-info/build.gradle | 19 +++++++++++++++--- .../link-graph/aggregate/build.gradle | 14 +++++++++++-- code/functions/link-graph/api/build.gradle | 14 +++++++++++-- .../link-graph/partition/build.gradle | 19 +++++++++++++++--- code/functions/math/api/build.gradle | 14 +++++++++++-- code/functions/math/build.gradle | 14 +++++++++++-- code/functions/search-query/api/build.gradle | 14 +++++++++++-- code/functions/search-query/build.gradle | 15 ++++++++++++-- code/index/api/build.gradle | 14 +++++++++++-- code/index/build.gradle | 14 +++++++++++-- .../language-processing/build.gradle | 5 ++++- code/libraries/message-queue/build.gradle | 10 ++++++++-- .../term-frequency-dict/build.gradle | 5 ++++- code/libraries/test-helpers/build.gradle | 9 ++++++++- .../processes/converting-process/build.gradle | 5 ++++- code/processes/crawling-process/build.gradle | 5 ++++- .../index-constructor-process/build.gradle | 7 ++++++- code/processes/loading-process/build.gradle | 5 ++++- .../build.gradle | 5 ++++- .../api-service/build.gradle | 10 ++++++++-- .../dating-service/build.gradle | 10 ++++++++-- .../explorer-service/build.gradle | 10 ++++++++-- .../search-service/build.gradle | 10 ++++++++-- .../assistant-service/build.gradle | 19 +++++++++++++++--- .../control-service/build.gradle | 10 ++++++++-- .../executor-service/build.gradle | 19 +++++++++++++++--- code/services-core/index-service/build.gradle | 19 +++++++++++++++--- code/services-core/query-service/build.gradle | 19 +++++++++++++++--- code/tools/experiment-runner/build.gradle | 5 ++++- .../screenshot-capture-tool/build.gradle | 5 ++++- settings.gradle | 8 +++++++- 54 files changed, 436 insertions(+), 88 deletions(-) diff --git a/code/common/config/build.gradle b/code/common/config/build.gradle index 6dc92737..d3628671 100644 --- a/code/common/config/build.gradle +++ b/code/common/config/build.gradle @@ -20,7 +20,10 @@ dependencies { implementation libs.bundles.slf4j implementation libs.bundles.mariadb implementation libs.mockito - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson testImplementation libs.bundles.slf4j.test diff --git a/code/common/db/build.gradle b/code/common/db/build.gradle index 48bbb85a..4f32b50d 100644 --- a/code/common/db/build.gradle +++ b/code/common/db/build.gradle @@ -33,7 +33,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.gson implementation libs.notnull diff --git a/code/common/linkdb/build.gradle b/code/common/linkdb/build.gradle index 6f544589..1d6d34d0 100644 --- a/code/common/linkdb/build.gradle +++ b/code/common/linkdb/build.gradle @@ -22,7 +22,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.gson implementation libs.notnull diff --git a/code/common/model/build.gradle b/code/common/model/build.gradle index 3adeec31..a424efca 100644 --- a/code/common/model/build.gradle +++ b/code/common/model/build.gradle @@ -17,7 +17,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.gson implementation libs.notnull diff --git a/code/common/process/build.gradle b/code/common/process/build.gradle index d242281b..51289ed4 100644 --- a/code/common/process/build.gradle +++ b/code/common/process/build.gradle @@ -19,7 +19,10 @@ dependencies { testImplementation libs.bundles.slf4j.test implementation libs.guava - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.mariadb implementation libs.commons.lang3 diff --git a/code/common/renderer/build.gradle b/code/common/renderer/build.gradle index 354363e4..751d9510 100644 --- a/code/common/renderer/build.gradle +++ b/code/common/renderer/build.gradle @@ -17,8 +17,14 @@ dependencies { implementation libs.bundles.slf4j implementation libs.bundles.handlebars - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/common/service/build.gradle b/code/common/service/build.gradle index 24cdb3a6..8cc9583e 100644 --- a/code/common/service/build.gradle +++ b/code/common/service/build.gradle @@ -16,11 +16,25 @@ dependencies { implementation project(':code:common:db') implementation project(':code:common:config') - implementation libs.spark - implementation libs.guice + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.curator - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.guava + implementation libs.bundles.prometheus implementation libs.bundles.slf4j implementation libs.bucket4j diff --git a/code/execution/api/build.gradle b/code/execution/api/build.gradle index c828b014..408c880e 100644 --- a/code/execution/api/build.gradle +++ b/code/execution/api/build.gradle @@ -38,9 +38,19 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.protobuf - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.gson testImplementation libs.bundles.slf4j.test diff --git a/code/execution/build.gradle b/code/execution/build.gradle index cfd29a8d..973f13c9 100644 --- a/code/execution/build.gradle +++ b/code/execution/build.gradle @@ -51,12 +51,26 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.spark - implementation libs.bundles.grpc + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty + + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.gson implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.trove implementation libs.zstd implementation libs.jsoup diff --git a/code/features-convert/adblock/build.gradle b/code/features-convert/adblock/build.gradle index 612c4fbb..d88d86d3 100644 --- a/code/features-convert/adblock/build.gradle +++ b/code/features-convert/adblock/build.gradle @@ -19,7 +19,10 @@ dependencies { implementation project(':code:common:config') implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.notnull implementation libs.jsoup diff --git a/code/features-convert/anchor-keywords/build.gradle b/code/features-convert/anchor-keywords/build.gradle index 3fe67739..1c25bd2e 100644 --- a/code/features-convert/anchor-keywords/build.gradle +++ b/code/features-convert/anchor-keywords/build.gradle @@ -23,7 +23,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.trove implementation libs.bundles.mariadb implementation libs.duckdb diff --git a/code/features-convert/data-extractors/build.gradle b/code/features-convert/data-extractors/build.gradle index 329f592e..f8841120 100644 --- a/code/features-convert/data-extractors/build.gradle +++ b/code/features-convert/data-extractors/build.gradle @@ -30,7 +30,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.trove implementation libs.commons.lang3 implementation libs.commons.compress diff --git a/code/features-convert/keyword-extraction/build.gradle b/code/features-convert/keyword-extraction/build.gradle index 3d4b3507..67da01f4 100644 --- a/code/features-convert/keyword-extraction/build.gradle +++ b/code/features-convert/keyword-extraction/build.gradle @@ -26,7 +26,10 @@ dependencies { implementation libs.jsoup implementation libs.commons.lang3 - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.guava implementation libs.trove diff --git a/code/features-convert/pubdate/build.gradle b/code/features-convert/pubdate/build.gradle index 43712d44..aeafcd99 100644 --- a/code/features-convert/pubdate/build.gradle +++ b/code/features-convert/pubdate/build.gradle @@ -19,7 +19,10 @@ dependencies { implementation project(':code:common:model') implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.notnull implementation libs.bundles.gson implementation libs.jsoup diff --git a/code/features-convert/reddit-json/build.gradle b/code/features-convert/reddit-json/build.gradle index 2303e985..fed33f4f 100644 --- a/code/features-convert/reddit-json/build.gradle +++ b/code/features-convert/reddit-json/build.gradle @@ -22,7 +22,10 @@ dependencies { implementation libs.jsoup implementation libs.sqlite - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.guava implementation libs.gson implementation libs.zstd diff --git a/code/features-convert/stackexchange-xml/build.gradle b/code/features-convert/stackexchange-xml/build.gradle index 7f6d72c3..62e289b0 100644 --- a/code/features-convert/stackexchange-xml/build.gradle +++ b/code/features-convert/stackexchange-xml/build.gradle @@ -22,7 +22,10 @@ dependencies { implementation libs.jsoup implementation libs.sqlite - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.guava implementation libs.zstd implementation libs.trove diff --git a/code/features-convert/summary-extraction/build.gradle b/code/features-convert/summary-extraction/build.gradle index c0b62102..24eec1ca 100644 --- a/code/features-convert/summary-extraction/build.gradle +++ b/code/features-convert/summary-extraction/build.gradle @@ -19,7 +19,10 @@ dependencies { implementation libs.jsoup - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.guava implementation libs.bundles.gson implementation libs.trove diff --git a/code/features-convert/topic-detection/build.gradle b/code/features-convert/topic-detection/build.gradle index e6c0a19e..ef29d275 100644 --- a/code/features-convert/topic-detection/build.gradle +++ b/code/features-convert/topic-detection/build.gradle @@ -21,7 +21,10 @@ dependencies { implementation project(':third-party:porterstemmer') implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.notnull implementation libs.jsoup diff --git a/code/features-crawl/crawl-blocklist/build.gradle b/code/features-crawl/crawl-blocklist/build.gradle index 8ebc19fe..f25f3363 100644 --- a/code/features-crawl/crawl-blocklist/build.gradle +++ b/code/features-crawl/crawl-blocklist/build.gradle @@ -26,7 +26,10 @@ dependencies { testImplementation libs.bundles.slf4j.test implementation libs.guava - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.commons.net diff --git a/code/features-crawl/link-parser/build.gradle b/code/features-crawl/link-parser/build.gradle index 751f5a3b..4e88e4d7 100644 --- a/code/features-crawl/link-parser/build.gradle +++ b/code/features-crawl/link-parser/build.gradle @@ -23,7 +23,10 @@ dependencies { testImplementation libs.bundles.slf4j.test implementation libs.guava - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.jsoup diff --git a/code/features-search/random-websites/build.gradle b/code/features-search/random-websites/build.gradle index 34d9744b..d3706ab5 100644 --- a/code/features-search/random-websites/build.gradle +++ b/code/features-search/random-websites/build.gradle @@ -20,7 +20,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.roaringbitmap implementation libs.trove implementation libs.fastutil diff --git a/code/features-search/screenshots/build.gradle b/code/features-search/screenshots/build.gradle index f7fb1b1a..dba09cae 100644 --- a/code/features-search/screenshots/build.gradle +++ b/code/features-search/screenshots/build.gradle @@ -20,8 +20,14 @@ dependencies { implementation libs.bundles.slf4j implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.bundles.mariadb implementation libs.commons.io diff --git a/code/functions/domain-info/api/build.gradle b/code/functions/domain-info/api/build.gradle index 5ea26173..ef1e6e68 100644 --- a/code/functions/domain-info/api/build.gradle +++ b/code/functions/domain-info/api/build.gradle @@ -25,10 +25,20 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.bundles.protobuf - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/functions/domain-info/build.gradle b/code/functions/domain-info/build.gradle index d41c2875..f0d167ff 100644 --- a/code/functions/domain-info/build.gradle +++ b/code/functions/domain-info/build.gradle @@ -27,10 +27,23 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.roaringbitmap diff --git a/code/functions/link-graph/aggregate/build.gradle b/code/functions/link-graph/aggregate/build.gradle index 1fe842f0..92d19308 100644 --- a/code/functions/link-graph/aggregate/build.gradle +++ b/code/functions/link-graph/aggregate/build.gradle @@ -23,9 +23,19 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.fastutil implementation libs.bundles.mariadb diff --git a/code/functions/link-graph/api/build.gradle b/code/functions/link-graph/api/build.gradle index 1573f1a8..f8cb8f3e 100644 --- a/code/functions/link-graph/api/build.gradle +++ b/code/functions/link-graph/api/build.gradle @@ -25,11 +25,21 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.bundles.protobuf implementation libs.roaringbitmap - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/functions/link-graph/partition/build.gradle b/code/functions/link-graph/partition/build.gradle index 34592680..b8e342b4 100644 --- a/code/functions/link-graph/partition/build.gradle +++ b/code/functions/link-graph/partition/build.gradle @@ -25,10 +25,23 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/functions/math/api/build.gradle b/code/functions/math/api/build.gradle index 760b2dee..c575aeb4 100644 --- a/code/functions/math/api/build.gradle +++ b/code/functions/math/api/build.gradle @@ -25,10 +25,20 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.bundles.protobuf - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/functions/math/build.gradle b/code/functions/math/build.gradle index 93c518b8..540d85c7 100644 --- a/code/functions/math/build.gradle +++ b/code/functions/math/build.gradle @@ -18,9 +18,19 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/functions/search-query/api/build.gradle b/code/functions/search-query/api/build.gradle index 424ba97d..b85497cc 100644 --- a/code/functions/search-query/api/build.gradle +++ b/code/functions/search-query/api/build.gradle @@ -28,11 +28,21 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.commons.lang3 implementation libs.bundles.protobuf - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.fastutil testImplementation libs.bundles.slf4j.test diff --git a/code/functions/search-query/build.gradle b/code/functions/search-query/build.gradle index 7e7d46b1..deddc7c9 100644 --- a/code/functions/search-query/build.gradle +++ b/code/functions/search-query/build.gradle @@ -36,9 +36,20 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.jsoup implementation libs.commons.lang3 implementation libs.trove diff --git a/code/index/api/build.gradle b/code/index/api/build.gradle index 7074052e..1c0873a8 100644 --- a/code/index/api/build.gradle +++ b/code/index/api/build.gradle @@ -22,12 +22,22 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.protobuf implementation libs.fastutil implementation libs.javax.annotation implementation libs.bundles.gson - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/index/build.gradle b/code/index/build.gradle index 4fc07aa8..574c27d8 100644 --- a/code/index/build.gradle +++ b/code/index/build.gradle @@ -40,9 +40,19 @@ dependencies { implementation libs.prometheus implementation libs.roaringbitmap - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.trove implementation libs.fastutil implementation libs.bundles.gson diff --git a/code/libraries/language-processing/build.gradle b/code/libraries/language-processing/build.gradle index 477d25f4..a92269b2 100644 --- a/code/libraries/language-processing/build.gradle +++ b/code/libraries/language-processing/build.gradle @@ -22,7 +22,10 @@ dependencies { implementation libs.bundles.slf4j implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.jsoup implementation libs.trove implementation libs.fastutil diff --git a/code/libraries/message-queue/build.gradle b/code/libraries/message-queue/build.gradle index 240dd6c1..2cfe41c1 100644 --- a/code/libraries/message-queue/build.gradle +++ b/code/libraries/message-queue/build.gradle @@ -12,8 +12,14 @@ java { apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { - implementation libs.spark - implementation libs.guice + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.bundles.slf4j diff --git a/code/libraries/term-frequency-dict/build.gradle b/code/libraries/term-frequency-dict/build.gradle index 44efcb62..29a8d98f 100644 --- a/code/libraries/term-frequency-dict/build.gradle +++ b/code/libraries/term-frequency-dict/build.gradle @@ -27,7 +27,10 @@ dependencies { implementation libs.bundles.slf4j implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.jsoup implementation libs.trove implementation libs.fastutil diff --git a/code/libraries/test-helpers/build.gradle b/code/libraries/test-helpers/build.gradle index d8dac98f..e6ca8f63 100644 --- a/code/libraries/test-helpers/build.gradle +++ b/code/libraries/test-helpers/build.gradle @@ -15,7 +15,14 @@ apply from: "$rootProject.projectDir/srcsets.gradle" dependencies { implementation libs.bundles.protobuf - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.bundles.slf4j implementation libs.bundles.mariadb implementation libs.bundles.slf4j.test diff --git a/code/processes/converting-process/build.gradle b/code/processes/converting-process/build.gradle index 9e0cbdd0..65ca316a 100644 --- a/code/processes/converting-process/build.gradle +++ b/code/processes/converting-process/build.gradle @@ -68,7 +68,10 @@ dependencies { implementation libs.jsoup - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.guava implementation libs.bundles.gson diff --git a/code/processes/crawling-process/build.gradle b/code/processes/crawling-process/build.gradle index ea721cd5..5105543d 100644 --- a/code/processes/crawling-process/build.gradle +++ b/code/processes/crawling-process/build.gradle @@ -46,7 +46,10 @@ dependencies { implementation libs.bundles.slf4j implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.zstd implementation libs.jwarc diff --git a/code/processes/index-constructor-process/build.gradle b/code/processes/index-constructor-process/build.gradle index c22e158e..4653133a 100644 --- a/code/processes/index-constructor-process/build.gradle +++ b/code/processes/index-constructor-process/build.gradle @@ -35,7 +35,12 @@ dependencies { implementation project(':code:index:index-journal') implementation libs.bundles.slf4j - implementation libs.guice + + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation libs.bundles.mariadb implementation libs.bundles.gson diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index 86c79095..7131d4ea 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -43,7 +43,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson implementation libs.commons.lang3 implementation libs.zstd diff --git a/code/processes/website-adjacencies-calculator/build.gradle b/code/processes/website-adjacencies-calculator/build.gradle index 6d990d14..d983cf2d 100644 --- a/code/processes/website-adjacencies-calculator/build.gradle +++ b/code/processes/website-adjacencies-calculator/build.gradle @@ -28,7 +28,10 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.roaringbitmap implementation libs.trove implementation libs.fastutil diff --git a/code/services-application/api-service/build.gradle b/code/services-application/api-service/build.gradle index cbc26c3c..848091f3 100644 --- a/code/services-application/api-service/build.gradle +++ b/code/services-application/api-service/build.gradle @@ -34,8 +34,14 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/services-application/dating-service/build.gradle b/code/services-application/dating-service/build.gradle index 95f2c4fb..7ada938f 100644 --- a/code/services-application/dating-service/build.gradle +++ b/code/services-application/dating-service/build.gradle @@ -36,8 +36,14 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/services-application/explorer-service/build.gradle b/code/services-application/explorer-service/build.gradle index c02ff9de..d2d75348 100644 --- a/code/services-application/explorer-service/build.gradle +++ b/code/services-application/explorer-service/build.gradle @@ -34,8 +34,14 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/services-application/search-service/build.gradle b/code/services-application/search-service/build.gradle index f502e66f..1e9f527d 100644 --- a/code/services-application/search-service/build.gradle +++ b/code/services-application/search-service/build.gradle @@ -59,9 +59,15 @@ dependencies { implementation libs.roaringbitmap implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.handlebars - implementation libs.spark + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/services-core/assistant-service/build.gradle b/code/services-core/assistant-service/build.gradle index 283e7804..a892d0aa 100644 --- a/code/services-core/assistant-service/build.gradle +++ b/code/services-core/assistant-service/build.gradle @@ -44,10 +44,23 @@ dependencies { implementation libs.bundles.slf4j implementation libs.prometheus - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.notnull - implementation libs.guice - implementation libs.spark + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 6214672e..2830bd5f 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -46,14 +46,20 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.zstd implementation libs.handlebars implementation libs.duckdb implementation libs.trove - implementation libs.spark + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.fastutil implementation libs.commons.io implementation libs.bundles.mariadb diff --git a/code/services-core/executor-service/build.gradle b/code/services-core/executor-service/build.gradle index 96adbc30..7693083b 100644 --- a/code/services-core/executor-service/build.gradle +++ b/code/services-core/executor-service/build.gradle @@ -62,12 +62,25 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.spark - implementation libs.bundles.grpc + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.gson implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.trove implementation libs.zstd implementation libs.jsoup diff --git a/code/services-core/index-service/build.gradle b/code/services-core/index-service/build.gradle index 23b942d1..7c7b1e0a 100644 --- a/code/services-core/index-service/build.gradle +++ b/code/services-core/index-service/build.gradle @@ -43,16 +43,29 @@ dependencies { implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.httpcomponents implementation libs.roaringbitmap implementation libs.snakeyaml - implementation libs.spark + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.opencsv implementation libs.trove implementation libs.fastutil implementation libs.bundles.gson - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + implementation libs.bundles.mariadb testImplementation libs.bundles.slf4j.test diff --git a/code/services-core/query-service/build.gradle b/code/services-core/query-service/build.gradle index 8feeb5c5..70a3738e 100644 --- a/code/services-core/query-service/build.gradle +++ b/code/services-core/query-service/build.gradle @@ -40,13 +40,26 @@ dependencies { implementation libs.bundles.slf4j - implementation libs.spark + implementation dependencies.create(libs.spark.get()) { + exclude group: 'org.eclipse.jetty' + } + implementation libs.bundles.jetty implementation libs.gson implementation libs.prometheus implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.bundles.mariadb - implementation libs.bundles.grpc + implementation libs.guava + libs.bundles.grpc.get().each { + implementation dependencies.create(it) { + exclude group: 'com.google.guava' + } + } + + testImplementation libs.bundles.slf4j.test testImplementation libs.bundles.junit diff --git a/code/tools/experiment-runner/build.gradle b/code/tools/experiment-runner/build.gradle index 26e6ce85..17be5cb4 100644 --- a/code/tools/experiment-runner/build.gradle +++ b/code/tools/experiment-runner/build.gradle @@ -44,7 +44,10 @@ dependencies { implementation libs.bundles.slf4j implementation libs.notnull - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.jsoup implementation libs.trove implementation libs.fastutil diff --git a/code/tools/screenshot-capture-tool/build.gradle b/code/tools/screenshot-capture-tool/build.gradle index 82be9729..a022c803 100644 --- a/code/tools/screenshot-capture-tool/build.gradle +++ b/code/tools/screenshot-capture-tool/build.gradle @@ -34,7 +34,10 @@ dependencies { implementation libs.notnull implementation libs.commons.compress implementation libs.commons.io - implementation libs.guice + implementation libs.guava + implementation dependencies.create(libs.guice.get()) { + exclude group: 'com.google.guava' + } implementation libs.gson testImplementation libs.bundles.slf4j.test diff --git a/settings.gradle b/settings.gradle index 06fc9bce..b2f795f9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -179,7 +179,7 @@ dependencyResolutionManagement { library('opennlp','org.apache.opennlp','opennlp-tools').version('2.3.3') library('fasttext','com.github.vinhkhuc','jfasttext').version('0.5') library('roaringbitmap','org.roaringbitmap','RoaringBitmap').version('0.9.32') - library('opencsv','com.opencsv','opencsv').version('5.6') + library('opencsv','com.opencsv','opencsv').version('5.9') library('bucket4j','com.github.vladimir-bukhtoyarov','bucket4j-core').version('7.5.0') library('gson','com.google.code.gson','gson').version('2.10.1') @@ -214,6 +214,12 @@ dependencyResolutionManagement { library('curator-framework', 'org.apache.curator','curator-framework').version('5.6.0') library('curator-x-discovery', 'org.apache.curator','curator-x-discovery').version('5.6.0') + library('jetty-server','org.eclipse.jetty','jetty-server').version('9.4.54.v20240208') + library('jetty-util','org.eclipse.jetty','jetty-util').version('9.4.54.v20240208') + library('jetty-servlet','org.eclipse.jetty','jetty-servlet').version('9.4.54.v20240208') + + bundle('jetty', ['jetty-server', 'jetty-util', 'jetty-servlet']) + bundle('slf4j', ['slf4j.api', 'log4j.api', 'log4j.core', 'log4j.slf4j']) bundle('slf4j.test', ['slf4j.jdk14']) bundle('prometheus', ['prometheus', 'prometheus-servlet', 'prometheus-server', 'prometheus-hotspot'])