Skip to content

Commit 5950fc1

Browse files
Update all patch and minor versions
1 parent f4bb945 commit 5950fc1

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939
// When updating, update above in plugins too
4040
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.9.0")
4141
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.5.0")
42-
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
42+
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.2")
4343
implementation("com.squareup:javapoet:1.13.0")
4444
implementation("com.squareup.wire:wire-compiler")
4545
implementation("com.squareup.wire:wire-gradle-plugin")

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.9.0"
47+
toolVersion = "13.11.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.8.0"
19-
val armeriaVersion = "1.40.0"
19+
val armeriaVersion = "1.41.0"
2020
val junitVersion = "5.14.4"
2121
val junitPlatformVersion = "1.14.4"
22-
val okhttpVersion = "5.4.0"
22+
val okhttpVersion = "5.5.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.22.1",
31-
"com.google.guava:guava-bom:33.6.0-jre",
30+
"com.fasterxml.jackson:jackson-bom:2.22.2",
31+
"com.google.guava:guava-bom:33.7.0-jre",
3232
"com.google.protobuf:protobuf-bom:4.35.1",
3333
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
3434
"com.squareup.okio:okio-bom:3.18.1", // applies to transitive dependencies of okhttp
3535
"io.grpc:grpc-bom:1.83.1",
36-
"io.netty:netty-bom:4.2.16.Final",
36+
"io.netty:netty-bom:4.2.17.Final",
3737
"org.assertj:assertj-bom:3.27.7",
3838
"org.osgi:org.osgi.test.bom:1.3.0",
3939
"org.testcontainers:testcontainers-bom:2.0.5",
@@ -97,7 +97,7 @@ val DEPENDENCIES = listOf(
9797
"org.apache.felix:org.apache.felix.framework:7.0.5",
9898
"org.awaitility:awaitility:4.3.0",
9999
"org.codehaus.mojo:animal-sniffer-annotations:1.27",
100-
"org.jctools:jctools-core:4.0.6",
100+
"org.jctools:jctools-core:4.0.7",
101101
"org.junit-pioneer:junit-pioneer:1.9.1",
102102
"org.mock-server:mockserver-netty:5.15.0:shaded",
103103
"org.osgi:osgi.core:8.0.0",

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.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6";
63+
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc";
6464

6565
private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;
6666

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
3+
distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
55
networkTimeout=10000
66
retries=0
77
retryBackOffMs=500

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.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6";
117+
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc";
118118

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

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.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"))
73+
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"))
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.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6");
40+
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc");
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.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6");
42+
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc");
4343
private static final int EXPOSED_PORT = 5678;
4444
private static final int HEALTH_CHECK_PORT = 13133;
4545
private Tracer tracer;

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
id("com.gradle.develocity") version "4.5.0"
55
id("de.undercouch.download") version "5.7.0"
66
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
7-
id("org.graalvm.buildtools.native") version "1.1.7"
7+
id("org.graalvm.buildtools.native") version "1.1.9"
88
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
99
}
1010
}

0 commit comments

Comments
 (0)