(*) Lift jetty and guava-dependencies

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

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

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

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

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
 

code/common/renderer/build.gradle

@@ -17,8 +17,14 @@ dependencies {
     implementation libs.bundles.slf4j
 
     implementation libs.bundles.handlebars
-    implementation libs.guice
+    implementation libs.guava
-    implementation libs.spark
+    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

code/common/service/build.gradle

@@ -16,11 +16,25 @@ dependencies {
     implementation project(':code:common:db')
     implementation project(':code:common:config')
 
-    implementation libs.spark
+    implementation dependencies.create(libs.spark.get()) {
-    implementation libs.guice
+        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

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

code/execution/build.gradle

@@ -51,12 +51,26 @@ dependencies {
 
     implementation libs.bundles.slf4j
 
-    implementation libs.spark
+    implementation dependencies.create(libs.spark.get()) {
-    implementation libs.bundles.grpc
+        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

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
 

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

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

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

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

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

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

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

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
 

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
 

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
 

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

code/features-search/screenshots/build.gradle

@@ -20,8 +20,14 @@ dependencies {
     implementation libs.bundles.slf4j
 
     implementation libs.notnull
-    implementation libs.guice
+    implementation libs.guava
-    implementation libs.spark
+    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
 

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

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.guava
-    implementation libs.spark
+    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

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
 

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

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.guava
-    implementation libs.spark
+    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

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

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

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

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

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

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

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

code/libraries/message-queue/build.gradle

@@ -12,8 +12,14 @@ java {
 apply from: "$rootProject.projectDir/srcsets.gradle"
 
 dependencies {
-    implementation libs.spark
+    implementation dependencies.create(libs.spark.get()) {
-    implementation libs.guice
+        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

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

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

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
 

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

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
 

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

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

code/services-application/api-service/build.gradle

@@ -34,8 +34,14 @@ dependencies {
 
     implementation libs.prometheus
     implementation libs.notnull
-    implementation libs.guice
+    implementation libs.guava
-    implementation libs.spark
+    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

code/services-application/dating-service/build.gradle

@@ -36,8 +36,14 @@ dependencies {
 
     implementation libs.prometheus
     implementation libs.notnull
-    implementation libs.guice
+    implementation libs.guava
-    implementation libs.spark
+    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

code/services-application/explorer-service/build.gradle

@@ -34,8 +34,14 @@ dependencies {
 
     implementation libs.prometheus
     implementation libs.notnull
-    implementation libs.guice
+    implementation libs.guava
-    implementation libs.spark
+    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

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

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.guava
-    implementation libs.spark
+    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

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

code/services-core/executor-service/build.gradle

@@ -62,12 +62,25 @@ dependencies {
 
     implementation libs.bundles.slf4j
 
-    implementation libs.spark
+    implementation dependencies.create(libs.spark.get()) {
-    implementation libs.bundles.grpc
+        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

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

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

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

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

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'])