Merge branch 'main' into logback-appender-test-cleanup

Author: trask

.github/workflows/update-latest-dep-versions.yml

@@ -27,7 +27,7 @@ jobs:
           java-version-file: .java-version
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
 
       - name: Resolve latest dep versions
         run: >
@@ -48,7 +48,7 @@ jobs:
         if: steps.check-changes.outputs.changed == 'true'
         run: .github/scripts/use-cla-approved-bot.sh
 
-      - uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+      - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
         if: steps.check-changes.outputs.changed == 'true'
         id: otelbot-token
         with:

benchmark-overhead-jmh/build.gradle.kts

@@ -12,7 +12,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:4.0.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:4.0.6")
 }
 
 tasks {

benchmark-overhead/Dockerfile.petclinic

@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
 RUN ./mvnw package -Dmaven.test.skip=true
 RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
 
-FROM bellsoft/liberica-openjdk-alpine:25.0.2@sha256:31929ba9551e22cf598d6b65129c50eb0236f9dc3bde2b4270cb93bea4d7c85a
+FROM bellsoft/liberica-openjdk-alpine:25.0.3@sha256:e8ac7321502a0dbabc502ba53d5c1a179ec5a21096cc4b9e52f4dad7b73844ee
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966

benchmark-overhead/build.gradle.kts

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-  implementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
+  implementation(enforcedPlatform("org.junit:junit-bom:5.14.4"))
 
   testImplementation(platform("org.testcontainers:testcontainers-bom:2.0.5"))
   testImplementation("org.testcontainers:testcontainers:2.0.5")

conventions/build.gradle.kts

@@ -78,7 +78,7 @@ dependencies {
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.0.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testImplementation("org.assertj:assertj-core:3.27.7")

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -419,7 +419,7 @@ afterEvaluate {
 checkstyle {
   configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
-  toolVersion = "13.4.0"
+  toolVersion = "13.4.1"
   maxWarnings = 0
 }
 

dependencyManagement/build.gradle.kts

@@ -80,12 +80,12 @@ val CORE_DEPENDENCIES = listOf(
 // There are dependencies included here that appear to have no usages, but are maintained at
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
-  "org.junit.jupiter:junit-jupiter-api:5.14.3",
+  "org.junit.jupiter:junit-jupiter-api:5.14.4",
 
   "io.r2dbc:r2dbc-proxy:1.1.6.RELEASE",
   "ch.qos.logback:logback-classic:1.3.16", // 1.4+ requires Java 11+
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.13.3",
+  "com.uber.nullaway:nullaway:0.13.4",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.11.0",
   "commons-codec:commons-codec:1.22.0",

examples/distro/build.gradle

@@ -69,7 +69,7 @@ subprojects {
 
     testImplementation("org.mockito:mockito-core:5.23.0")
 
-    testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
+    testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.4"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")

examples/extension/build.gradle.kts

@@ -108,7 +108,7 @@ dependencies {
   testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.10.0-alpha")
   testImplementation("org.assertj:assertj-core:3.27.7")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")

gradle-plugins/build.gradle.kts

@@ -49,7 +49,7 @@ dependencies {
 
   testImplementation("org.assertj:assertj-core:3.27.7")
 
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.3"))
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
   testRuntimeOnly("org.junit.platform:junit-platform-launcher")