Skip to content

Unify OkHttp dependency catalog entries #12201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexeyKuznetsov-DD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Unify OkHttp dependency catalog entries #12201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab40cca
Cleanup okhttp versions declaration and usages.
AlexeyKuznetsov-DD Aug 12, 2026
ac8b2b7
More cleanup and renaming.
AlexeyKuznetsov-DD Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions communication/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies {
implementation(project(":utils:socket-utils"))
implementation(project(":utils:version-utils"))

api(libs.okio)
api(libs.okhttp)
api(libs.okio.datadog)
api(libs.okhttp.datadog)
api(libs.moshi)
// metrics-lib is needed rather than metrics-api to change the default port of StatsD connection manager
// TODO Could help decoupling it later to only depend on metrics-api
Expand All @@ -29,11 +29,7 @@ dependencies {
testImplementation(libs.bytebuddy)
testImplementation("org.msgpack:msgpack-core:0.8.20")
testImplementation("org.msgpack:jackson-dataformat-msgpack:0.8.20")
testImplementation(
group = "com.squareup.okhttp3",
name = "mockwebserver",
version = libs.versions.okhttp.legacy.get() // actually a version range
)
testImplementation(libs.okhttp3.mockwebserver)
}

extra["minimumBranchCoverage"] = 0.5
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-aiguard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ java {
dependencies {
api libs.slf4j
implementation libs.moshi
implementation libs.okhttp
implementation libs.okhttp.datadog

api project(':dd-trace-api')
api project(':utils:version-utils')
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/agent-crashtracking/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ dependencies {
implementation project(':utils:version-utils')
implementation project(path: ':dd-java-agent:ddprof-lib', configuration: 'shadow')

implementation libs.okhttp
implementation libs.okhttp.datadog
implementation libs.moshi

testImplementation libs.bundles.junit5
testImplementation libs.bundles.mockito
testImplementation libs.assertj.core
testImplementation libs.json.unit.assertj
testImplementation libs.jackson.databind
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation libs.okhttp3.mockwebserver
}

4 changes: 2 additions & 2 deletions dd-java-agent/agent-debugger/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
implementation libs.bundles.asm
implementation libs.dogstatsd
implementation libs.moshi
implementation libs.okhttp
implementation libs.okhttp.datadog
implementation libs.slf4j

// Dependencies needed to compile the test-fixture helpers (LogProbeTestHelper,
Expand All @@ -64,7 +64,7 @@ dependencies {
testImplementation libs.bundles.junit5
testImplementation libs.junit.jupiter.params
testImplementation libs.bundles.mockito
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation libs.okhttp3.mockwebserver
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'
testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
Expand Down
3 changes: 1 addition & 2 deletions dd-java-agent/agent-debugger/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.21=testCompileClasspath,test
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.21=testRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.6.10=testRuntimeClasspath
org.jetbrains.kotlin:kotlin-script-runtime:2.1.21=testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0=testCompileClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21=testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0=testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.3.0=testCompileClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.1.21=testRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.0.0=testCompileClasspath,testRuntimeClasspath
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/agent-profiling/profiling-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ excludedClassesCoverage += [// These classes are using only for testing

dependencies {
api libs.guava
api libs.okhttp
api libs.okhttp.datadog
api group: 'org.javadelight', name: 'delight-fileupload', version: '0.0.5'
api group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
api libs.okhttp3.mockwebserver
}

5 changes: 2 additions & 3 deletions dd-java-agent/agent-profiling/profiling-uploader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {

implementation project(':dd-java-agent:agent-profiling:profiling-controller')

implementation libs.okhttp
implementation libs.okhttp.datadog
implementation libs.lz4
implementation libs.aircompressor

Expand All @@ -39,6 +39,5 @@ dependencies {
testImplementation libs.bundles.junit5
testImplementation libs.bundles.mockito
testImplementation libs.jackson.databind
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation libs.okhttp3.mockwebserver
}

4 changes: 2 additions & 2 deletions dd-java-agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,12 @@ dependencies {
testImplementation project(':dd-trace-core')
testImplementation project(':utils:test-utils')

testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation libs.okhttp3.mockwebserver
testImplementation project(':utils:test-agent-utils:decoder')

testImplementation libs.bundles.test.logging
testImplementation libs.guava
testImplementation libs.okhttp
testImplementation libs.okhttp.datadog
testImplementation group: 'io.opentracing', name: 'opentracing-util', version: '0.31.0'

// Includes for the top level shadow jar
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies {
compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'

// These are the common dependencies that are inherited by the other test sets
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: libs.versions.okhttp3.testing.get()
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ dependencies {
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'

//testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '2.9.0'
testImplementation group: 'com.typesafe.akka', name: 'akka-http-jackson_2.13', version: '10.6.0'
Expand Down
5 changes: 2 additions & 3 deletions dd-java-agent/instrumentation/okhttp/okhttp-2.2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ apply from: "$rootDir/gradle/java.gradle"
addTestSuiteForDir('latestDepTest', 'test')

dependencies {
compileOnly(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0')
compileOnly libs.okhttp2.minimum

implementation(project(':dd-java-agent:agent-tooling')) {
exclude module: 'okhttp'
Expand All @@ -37,12 +37,11 @@ dependencies {
testImplementation(project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')) {
exclude module: 'okhttp'
}
testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
testImplementation libs.okhttp2.minimum

testRuntimeOnly(project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter'))
testRuntimeOnly(project(':dd-java-agent:instrumentation:java:java-net:java-net-1.8'))

latestDepTestImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '[2.6,3)'
}


12 changes: 7 additions & 5 deletions dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ apply from: "$rootDir/gradle/java.gradle"

addTestSuiteForDir('latestDepTest', 'test')

def latestVersion = '3.+'

dependencies {
compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
compileOnly libs.okhttp3.minimum

@datadog-prod-us1-4 datadog-prod-us1-4 Bot Aug 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Keep instrumentation minimums module-local

A future catalog bump could stop testing an advertised minimum and allow newer API usage that fails for customers on that version.

Assertion details
  • Input: A maintainer raises okhttp3-minimum or okhttp2-minimum for the smoke-test applications without intending to change instrumentation support.
  • Expected: Per the repository’s explicit Gradle guidance, instrumented-library compatibility floors should remain exact and local to each instrumentation module.
  • Actual: The OkHttp 3 compile and minimum-test bounds now read a global catalog value also used by smoke-test modules. The same coupling was introduced in the sibling OkHttp 2 module. The complete fix is to restore local 3.0.0 values for OkHttp 3 compile/strict/preferred bounds and local 2.2.0 values for both OkHttp 2 declarations; existing test sources need no changes because the minimum/latest suites already exercise these boundaries.

Was this helpful? React 👍 or 👎
🤖 Datadog Autotest · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest


testImplementation(group: 'com.squareup.okhttp3', name: 'okhttp') {
version {
strictly '[3.0.0,4]'
prefer '3.0.0'
strictly "[${libs.versions.okhttp3.minimum.get()},4)"
prefer libs.versions.okhttp3.minimum.get()
}
}
testImplementation(group: 'com.squareup.okio', name: 'okio') {
testImplementation('com.squareup.okio:okio') {
version {
strictly '[1.6.0,2]'
prefer '1.6.0'
Expand All @@ -33,7 +35,7 @@ dependencies {
}
}

latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4)'
latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: latestVersion
latestDepTestImplementation group: 'com.squareup.okio', name: 'okio', version: '1.+'

testRuntimeOnly(project(':dd-java-agent:instrumentation:datadog:asm:iast-instrumenter'))
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
compileOnly group: 'org.apache.pekko', name: 'pekko-stream_2.12', version: '1.0.1'

// These are the common dependencies that are inherited by the other test sets
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: libs.versions.okhttp3.testing.get()
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
testImplementation project(':dd-java-agent:instrumentation:pekko:pekko-concurrent-1.0')
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ dependencies {
// Since jetty-server is shadowed, it is needed to exports the servlet api as well.
api group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'

api group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: libs.versions.okhttp.legacy.get()
api group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: libs.versions.okhttp3.testing.get()

api project(':dd-java-agent:agent-tooling')
api project(':dd-java-agent:agent-installer')
Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/appsec/springboot/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
// ssrf
implementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
implementation libs.okhttp2.minimum
implementation libs.okhttp3.minimum

testImplementation project(':dd-smoke-tests:appsec')
}
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply from: "$rootDir/gradle/java.gradle"
description = 'dd-smoke-tests'

dependencies {
api libs.okhttp
api libs.okhttp.datadog
api project(':dd-java-agent:testing')
api project(':utils:test-agent-utils:decoder')

Expand Down
3 changes: 1 addition & 2 deletions dd-smoke-tests/debugger-integration-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description = 'Debugger Integration Tests.'
dependencies {
implementation project(':dd-trace-api')
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.4.5'
implementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
implementation libs.okhttp3.mockwebserver

testImplementation project(':dd-smoke-tests')
testImplementation project(':dd-java-agent:agent-debugger')
Expand Down Expand Up @@ -54,4 +54,3 @@ tasks.withType(Test).configureEach {
}
})
}

4 changes: 2 additions & 2 deletions dd-smoke-tests/iast-util/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies {
// ssrf
compileOnly group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
compileOnly group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
compileOnly group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
compileOnly libs.okhttp2.minimum
compileOnly libs.okhttp3.minimum
compileOnly group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.0'
compileOnly group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'
// mail
Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ dependencies {
// ssrf
implementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
implementation libs.okhttp2.minimum
implementation libs.okhttp3.minimum
implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.0'
implementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'

Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/springboot/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ dependencies {
// ssrf
implementation group: 'commons-httpclient', name: 'commons-httpclient', version: '2.0'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0'
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
implementation libs.okhttp2.minimum
implementation libs.okhttp3.minimum
implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.0'
implementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.0'

Expand Down
4 changes: 2 additions & 2 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ CachedData.deps.shared = [
// When all of the dependencies are declared in dd-trace-core, moshi overrides the okhttp's
// transitive dependency. Since okhttp is declared here and moshi is not, this lead to an incompatible version
// TODO: Consider migrating away from Moshi, Okio, etc. to more modern JSON libraries with better (de)serialization support
libs.okio,
libs.okhttp,
libs.okio.datadog,
libs.okhttp.datadog,
libs.dogstatsd,
libs.jnr.unixsocket,
libs.moshi,
Expand Down
19 changes: 13 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ tabletest-formatter = "1.1.2"
# DataDog libs and forks
ddprof = "1.49.0"
dogstatsd = "4.4.5"
okhttp = "3.12.15" # Datadog fork to support Java 7
okhttp-datadog = "3.12.15" # Datadog fork
okio-datadog = "1.17.6" # Datadog fork

# Languages
## Groovy
Expand Down Expand Up @@ -51,8 +52,8 @@ jafar = "0.16.0"

# Web & Network
jnr-unixsocket = "0.38.25"
okhttp-legacy = "[3.0,3.12.12]" # 3.12.x is last version to support Java7
okio = "1.17.6" # Datadog fork
okhttp2-minimum = "2.2.0"
okhttp3-minimum = "3.0.0"
Comment on lines +55 to +56

@PerfectSlayer PerfectSlayer Aug 13, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔨 issue: ‏okhttp2-minimum / okhttp3-minimum versions and libraries are instrumentation specific. I would rather keep the main version catalog for core and platform components.
What about creating a dedicated lib catalog for the related libraries if you need to share some version numbers?


# Cryptography
cafe_crypto = "0.1.0"
Expand All @@ -75,12 +76,13 @@ moshi = "1.11.0"

# Testing
assertj = "3.27.7"
json-unit = "2.40.1"
junit4 = "4.13.2"
junit5 = "5.14.1"
junit-platform = "1.14.1"
mockito = "4.4.0"
okhttp3-testing = "3.12.12"
spock = "2.4-groovy-3.0"
json-unit = "2.40.1"
tabletest = "1.2.2"
testcontainers = "1.21.4"

Expand All @@ -95,7 +97,8 @@ spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", ve
# DataDog libs and forks
ddprof = { module = "com.datadoghq:ddprof", version.ref = "ddprof" }
dogstatsd = { module = "com.datadoghq:java-dogstatsd-client", version.ref = "dogstatsd" }
okhttp = { module = "com.datadoghq.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-datadog = { module = "com.datadoghq.okhttp3:okhttp", version.ref = "okhttp-datadog" }
okio-datadog = { module = "com.datadoghq.okio:okio", version.ref = "okio-datadog" }

# Languages
## Groovy
Expand Down Expand Up @@ -133,7 +136,6 @@ jmc-flightrecorder = { module = "org.openjdk.jmc:flightrecorder", version.ref =
jafar-tools = { module = "io.btrace:jafar-tools", version.ref = "jafar" }

# Web & Network
okio = { module = "com.datadoghq.okio:okio", version.ref = "okio" }
jnr-unixsocket = { module = "com.github.jnr:jnr-unixsocket", version.ref = "jnr-unixsocket"}

# Cryptography
Expand Down Expand Up @@ -162,6 +164,10 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
jackson-databind = {module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

# Web & Network
okhttp2-minimum = { module = "com.squareup.okhttp:okhttp", version.ref = "okhttp2-minimum" }
okhttp3-minimum = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3-minimum" }

# Testing
assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" }
json-unit-assertj = { module = "net.javacrumbs.json-unit:json-unit-assertj", version.ref = "json-unit" }
Expand All @@ -172,6 +178,7 @@ junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", vers
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
mokito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mokito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3-testing" }
objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Spock for mocking:
spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
spock-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock" }
Expand Down
2 changes: 1 addition & 1 deletion remote-config/remote-config-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
api(project(":remote-config:remote-config-api"))

implementation(libs.slf4j)
implementation(libs.okhttp)
implementation(libs.okhttp.datadog)
implementation(libs.moshi)
implementation(libs.bundles.cafe.crypto)

Expand Down
2 changes: 1 addition & 1 deletion telemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
compileOnly(project(":utils:container-utils"))
testImplementation(project(":utils:container-utils"))

api(libs.okhttp)
api(libs.okhttp.datadog)
api(libs.moshi)

testImplementation(project(":utils:test-utils"))
Expand Down
2 changes: 1 addition & 1 deletion utils/config-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ dependencies {

testImplementation(project(":utils:test-utils"))
testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
testImplementation("com.squareup.okhttp3:mockwebserver:${libs.versions.okhttp.legacy.get()}")
testImplementation(libs.okhttp3.mockwebserver)
}
2 changes: 1 addition & 1 deletion utils/flare-utils/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
apply(from = "$rootDir/gradle/java.gradle")

dependencies {
api(libs.okhttp)
api(libs.okhttp.datadog)
api(libs.moshi)

compileOnly(project(":communication"))
Expand Down
Loading