Skip to content

Commit 077a233

Browse files
Merge branch 'main' into add_metric_annotation_instrument
2 parents 19e8c9c + a260205 commit 077a233

File tree

54 files changed

+1084
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1084
-96
lines changed

conventions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ dependencies {
7474
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")
7676
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
77-
testImplementation("org.assertj:assertj-core:3.27.3")
77+
testImplementation("org.assertj:assertj-core:3.27.4")
7878
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ codenarc {
431431
checkstyle {
432432
configFile = rootProject.file("buildscripts/checkstyle.xml")
433433
// this version should match the version of google_checks.xml used as basis for above configuration
434-
toolVersion = "10.26.1"
434+
toolVersion = "11.0.0"
435435
maxWarnings = 0
436436
}
437437

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ val DEPENDENCIES = listOf(
8989
"com.github.stefanbirkner:system-lambda:1.2.1",
9090
"com.github.stefanbirkner:system-rules:1.19.0",
9191
"uk.org.webcompere:system-stubs-jupiter:2.0.3",
92-
"com.uber.nullaway:nullaway:0.12.7",
92+
"com.uber.nullaway:nullaway:0.12.8",
9393
"commons-beanutils:commons-beanutils:1.11.0",
9494
"commons-cli:commons-cli:1.10.0",
9595
"commons-codec:commons-codec:1.19.0",
@@ -109,7 +109,7 @@ val DEPENDENCIES = listOf(
109109
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
110110
"io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
111111
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
112-
"org.assertj:assertj-core:3.27.3",
112+
"org.assertj:assertj-core:3.27.4",
113113
"org.awaitility:awaitility:4.3.0",
114114
"com.google.code.findbugs:annotations:3.0.1u2",
115115
"com.google.code.findbugs:jsr305:3.0.2",

0 commit comments

Comments
 (0)