Skip to content

Commit 1957569

Browse files
Update all patch and minor versions
1 parent 05dfe4e commit 1957569

10 files changed

Lines changed: 17 additions & 17 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ repositories {
3333
}
3434

3535
dependencies {
36-
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.2.3")
36+
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.3.0")
3737
implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.4.0"))
3838
implementation("com.google.auto.value:auto-value-annotations:1.11.1")
3939
// When updating, update above in plugins too
@@ -47,8 +47,8 @@ dependencies {
4747
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.6")
4848
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
4949
implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0")
50-
implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.0.0")
51-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21")
50+
implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.1.0")
51+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.0")
5252
implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:3.1.5")
5353
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
5454
}

buildSrc/src/main/kotlin/otel.jacoco-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
jacoco {
8-
toolVersion = "0.8.14"
8+
toolVersion = "0.8.15"
99
}
1010

1111
// https://docs.gradle.org/current/samples/sample_jvm_multi_project_with_code_coverage.html

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ java {
4444

4545
checkstyle {
4646
configDirectory.set(file("$rootDir/buildscripts/"))
47-
toolVersion = "13.4.2"
47+
toolVersion = "13.5.0"
4848
isIgnoreFailures = false
4949
configProperties["rootDir"] = rootDir
5050
}

dependencyManagement/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@ val mockitoVersion = "4.11.0"
1616
val slf4jVersion = "2.0.18"
1717
val opencensusVersion = "0.31.1"
1818
val prometheusServerVersion = "1.5.1"
19-
val armeriaVersion = "1.39.0"
19+
val armeriaVersion = "1.39.1"
2020
val junitVersion = "5.14.4"
2121
val junitPlatformVersion = "1.14.4"
22-
val okhttpVersion = "5.3.2"
22+
val okhttpVersion = "5.4.0"
2323

2424
val DEPENDENCY_BOMS = listOf(
2525
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2626
// even if they are only used by test dependencies, so not using junit bom here
2727
// (which is EPL licensed) or armeria bom (which is Apache licensed but is getting flagged
2828
// by FOSSA for containing EPL-licensed)
2929

30-
"com.fasterxml.jackson:jackson-bom:2.21.3",
30+
"com.fasterxml.jackson:jackson-bom:2.22.0",
3131
"com.google.guava:guava-bom:33.6.0-jre",
3232
"com.google.protobuf:protobuf-bom:4.35.0",
3333
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
3434
"com.squareup.okio:okio-bom:3.17.0", // applies to transitive dependencies of okhttp
3535
"io.grpc:grpc-bom:1.81.0",
36-
"io.netty:netty-bom:4.2.14.Final",
36+
"io.netty:netty-bom:4.2.15.Final",
3737
"io.zipkin.brave:brave-bom:6.3.1",
3838
"io.zipkin.reporter2:zipkin-reporter-bom:3.5.3",
3939
"org.assertj:assertj-bom:3.27.7",
@@ -74,13 +74,13 @@ val DEPENDENCIES = listOf(
7474
"io.prometheus:prometheus-metrics-exposition-formats-no-protobuf:${prometheusServerVersion}",
7575
"javax.annotation:javax.annotation-api:1.3.2",
7676
"com.github.stefanbirkner:system-rules:1.19.0",
77-
"com.google.api.grpc:proto-google-common-protos:2.71.0",
77+
"com.google.api.grpc:proto-google-common-protos:2.72.0",
7878
"com.google.code.findbugs:jsr305:3.0.2",
7979
"com.google.guava:guava-beta-checker:1.0",
8080
"com.sun.net.httpserver:http:20070405",
8181
"com.squareup.okhttp3:okhttp:$okhttpVersion",
8282
"com.tngtech.archunit:archunit-junit5:1.4.2",
83-
"com.uber.nullaway:nullaway:0.13.4",
83+
"com.uber.nullaway:nullaway:0.13.6",
8484
"edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+
8585
"eu.rekawek.toxiproxy:toxiproxy-java:2.1.11",
8686
"io.github.crac:org-crac:0.1.3",

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
class CollectorIntegrationTest {
6161

6262
private static final String COLLECTOR_IMAGE =
63-
"otel/opentelemetry-collector-contrib:0.153.0@sha256:93aad750175cbf1a973ae1c5886c3371f4d800f61be25cdd26870b8441ffe9fa";
63+
"otel/opentelemetry-collector-contrib:0.154.0@sha256:b3079f45e19bdb7326bf49cdddce6cf60dfd865138db39f2733ea48ab17bc4cb";
6464

6565
private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;
6666

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ abstract class OtlpExporterIntegrationTest {
114114
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
115115

116116
private static final String COLLECTOR_IMAGE =
117-
"otel/opentelemetry-collector-contrib:0.153.0@sha256:93aad750175cbf1a973ae1c5886c3371f4d800f61be25cdd26870b8441ffe9fa";
117+
"otel/opentelemetry-collector-contrib:0.154.0@sha256:b3079f45e19bdb7326bf49cdddce6cf60dfd865138db39f2733ea48ab17bc4cb";
118118

119119
private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317;
120120
private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tools]
22

33
# Linters
4-
"aqua:grafana/flint" = "0.22.4"
4+
"aqua:grafana/flint" = "0.22.5"
55
lychee = "0.24.2"
66

77
[env]

perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class OtlpPipelineStressTest {
7070
public static final GenericContainer<?> collectorContainer =
7171
new GenericContainer<>(
7272
DockerImageName.parse(
73-
"otel/opentelemetry-collector-contrib:0.153.0@sha256:93aad750175cbf1a973ae1c5886c3371f4d800f61be25cdd26870b8441ffe9fa"))
73+
"otel/opentelemetry-collector-contrib:0.154.0@sha256:b3079f45e19bdb7326bf49cdddce6cf60dfd865138db39f2733ea48ab17bc4cb"))
7474
.withImagePullPolicy(PullPolicy.alwaysPull())
7575
.withNetwork(network)
7676
.withNetworkAliases("otel-collector")

sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private ExporterBenchmark() {}
3737
public abstract static class AbstractProcessorBenchmark {
3838
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
3939
DockerImageName.parse(
40-
"otel/opentelemetry-collector-contrib:0.153.0@sha256:93aad750175cbf1a973ae1c5886c3371f4d800f61be25cdd26870b8441ffe9fa");
40+
"otel/opentelemetry-collector-contrib:0.154.0@sha256:b3079f45e19bdb7326bf49cdddce6cf60dfd865138db39f2733ea48ab17bc4cb");
4141
protected static final int OTLP_PORT = 5678;
4242
private static final int HEALTH_CHECK_PORT = 13133;
4343
protected SdkSpanBuilder sdkSpanBuilder;

sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private SpanPipelineBenchmark() {}
3939
public abstract static class AbstractProcessorBenchmark {
4040
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
4141
DockerImageName.parse(
42-
"otel/opentelemetry-collector-contrib:0.153.0@sha256:93aad750175cbf1a973ae1c5886c3371f4d800f61be25cdd26870b8441ffe9fa");
42+
"otel/opentelemetry-collector-contrib:0.154.0@sha256:b3079f45e19bdb7326bf49cdddce6cf60dfd865138db39f2733ea48ab17bc4cb");
4343
private static final int EXPOSED_PORT = 5678;
4444
private static final int HEALTH_CHECK_PORT = 13133;
4545
private Tracer tracer;

0 commit comments

Comments
 (0)