Merge branch 'main' into fix-latest-dep-tests

Author: laurit

benchmark-overhead-jmh/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.3.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.3.6")
 }
 
 tasks {

dependencyManagement/build.gradle.kts

@@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
 val otelSdkVersion = "1.44.1"
-val otelContribVersion = "1.40.0-alpha"
+val otelContribVersion = "1.41.0-alpha"
 val otelSdkAlphaVersion = otelSdkVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 // Need both BOM and groovy jars

licenses/licenses.md

@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-  implementation("com.linecorp.armeria:armeria-grpc:1.31.0")
+  implementation("com.linecorp.armeria:armeria-grpc:1.31.1")
   implementation("io.opentelemetry.proto:opentelemetry-proto")
   runtimeOnly("org.slf4j:slf4j-simple")
 }

smoke-tests/images/fake-backend/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
   implementation(platform("io.grpc:grpc-bom:1.68.1"))
   implementation(platform("io.opentelemetry:opentelemetry-bom:1.0.0"))
   implementation(platform("io.opentelemetry:opentelemetry-bom-alpha:1.0.0-alpha"))
-  implementation(platform("org.apache.logging.log4j:log4j-bom:2.24.1"))
+  implementation(platform("org.apache.logging.log4j:log4j-bom:2.24.2"))
 
   implementation("io.grpc:grpc-netty-shaded")
   implementation("io.grpc:grpc-protobuf")

smoke-tests/images/grpc/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-  implementation("com.linecorp.armeria:armeria-junit5:1.31.0")
+  implementation("com.linecorp.armeria:armeria-junit5:1.31.1")
 }
 
 tasks {