Skip to content

Commit 77b234f

Browse files
authored
Merge branch 'main' into exclude-new-header
2 parents 3034c2e + b3df635 commit 77b234f

File tree

175 files changed

+1942
-2059
lines changed

Some content is hidden

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

175 files changed

+1942
-2059
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
143143
with(ctx.details) {
144144
if (id.group == "io.netty" && id.name != "netty") {
145145
if (id.version.startsWith("4.1.")) {
146-
belongsTo("io.netty:netty-bom:4.1.124.Final", false)
146+
belongsTo("io.netty:netty-bom:4.1.126.Final", false)
147147
} else if (id.version.startsWith("4.0.")) {
148148
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
149149
}
@@ -439,7 +439,7 @@ codenarc {
439439
checkstyle {
440440
configFile = rootProject.file("buildscripts/checkstyle.xml")
441441
// this version should match the version of google_checks.xml used as basis for above configuration
442-
toolVersion = "11.0.0"
442+
toolVersion = "11.0.1"
443443
maxWarnings = 0
444444
}
445445

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.19.2",
30+
"com.fasterxml.jackson:jackson-bom:2.20.0",
3131
"com.google.guava:guava-bom:33.4.8-jre",
3232
"org.apache.groovy:groovy-bom:${groovyVersion}",
3333
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
@@ -107,7 +107,7 @@ val DEPENDENCIES = listOf(
107107
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
108108
"io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
109109
"io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
110-
"io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha",
110+
"io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
111111
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
112112
"org.assertj:assertj-core:3.27.4",
113113
"org.awaitility:awaitility:4.3.0",

0 commit comments

Comments
 (0)