Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
11 changes: 6 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ nopen = "1.0.1"
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
okhttp = "4.9.2"
otel = "1.51.0"
otelInstrumentation = "2.17.0"
otelInstrumentationAlpha = "2.17.0-alpha"
otel = "1.57.0"
otelInstrumentation = "2.23.0"
otelInstrumentationAlpha = "2.23.0-alpha"
# check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version
otelSemanticConventions = "1.34.0"
otelSemanticConventionsAlpha = "1.34.0-alpha"
otelSemanticConventions = "1.37.0"
otelSemanticConventionsAlpha = "1.37.0-alpha"
retrofit = "2.9.0"
slf4j = "1.7.30"
springboot2 = "2.7.18"
Expand Down Expand Up @@ -127,6 +127,7 @@ nopen-annotations = { module = "com.jakewharton.nopen:nopen-annotations", versio
nopen-checker = { module = "com.jakewharton.nopen:nopen-checker", version.ref = "nopen" }
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.9.5" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" }
openfeature = { module = "dev.openfeature:sdk", version.ref = "openfeature" }
otel = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "otel" }
otel-extension-autoconfigure = { module = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", version.ref = "otel" }
Expand Down
7 changes: 7 additions & 0 deletions sentry-spring-boot-jakarta/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ tasks.withType<KotlinCompile>().configureEach {
compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
}

configurations.all {
Copy link
Member Author

Choose a reason for hiding this comment

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

Bumping OTel seems to have caused older versions of Spring Boot to have problems with OkHttp using v5 instead of v4 and MockWebServer breaking. This was the easier fix vs. bumping OkHttp to v5 and having to upgrade MockWebServer all over the repo.

resolutionStrategy {
force(libs.okhttp)
force(libs.okhttp.mockwebserver)
}
}

dependencies {
api(projects.sentry)
api(projects.sentrySpringJakarta)
Expand Down
7 changes: 7 additions & 0 deletions sentry-spring-boot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ tasks.withType<KotlinCompile>().configureEach {
compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
}

configurations.all {
resolutionStrategy {
force(libs.okhttp)
force(libs.okhttp.mockwebserver)
}
}

dependencies {
api(projects.sentry)
api(projects.sentrySpring)
Expand Down
Loading