Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ repositories {
}

dependencies {
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.3.0")
implementation("biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0")
implementation(enforcedPlatform("com.squareup.wire:wire-bom:6.4.5"))
implementation("com.google.auto.value:auto-value-annotations:1.11.1")
// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.9.0")
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.5.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.1")
implementation("com.fasterxml.jackson.core:jackson-databind:2.22.2")
implementation("com.squareup:javapoet:1.13.0")
implementation("com.squareup.wire:wire-compiler")
implementation("com.squareup.wire:wire-gradle-plugin")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ java {

checkstyle {
configDirectory.set(file("$rootDir/buildscripts/"))
toolVersion = "13.9.0"
toolVersion = "13.11.0"
isIgnoreFailures = false
configProperties["rootDir"] = rootDir
}
Expand Down
12 changes: 6 additions & 6 deletions dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.18"
val opencensusVersion = "0.31.1"
val prometheusServerVersion = "1.8.0"
val armeriaVersion = "1.40.0"
val armeriaVersion = "1.41.0"
val junitVersion = "5.14.4"
val junitPlatformVersion = "1.14.4"
val okhttpVersion = "5.4.0"
val okhttpVersion = "5.5.0"

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

"com.fasterxml.jackson:jackson-bom:2.22.1",
"com.google.guava:guava-bom:33.6.0-jre",
"com.fasterxml.jackson:jackson-bom:2.22.2",
"com.google.guava:guava-bom:33.7.1-jre",
"com.google.protobuf:protobuf-bom:4.35.1",
"com.squareup.okhttp3:okhttp-bom:$okhttpVersion",
"com.squareup.okio:okio-bom:3.18.1", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.83.1",
"io.netty:netty-bom:4.2.16.Final",
"io.netty:netty-bom:4.2.17.Final",
"org.assertj:assertj-bom:3.27.7",
"org.osgi:org.osgi.test.bom:1.3.0",
"org.testcontainers:testcontainers-bom:2.0.5",
Expand Down Expand Up @@ -97,7 +97,7 @@ val DEPENDENCIES = listOf(
"org.apache.felix:org.apache.felix.framework:7.0.5",
"org.awaitility:awaitility:4.3.0",
"org.codehaus.mojo:animal-sniffer-annotations:1.27",
"org.jctools:jctools-core:4.0.6",
"org.jctools:jctools-core:4.0.7",
"org.junit-pioneer:junit-pioneer:1.9.1",
"org.mock-server:mockserver-netty:5.15.0:shaded",
"org.osgi:osgi.core:8.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
class CollectorIntegrationTest {

private static final String COLLECTOR_IMAGE =
"otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6";
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc";

private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ abstract class OtlpExporterIntegrationTest {
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");

private static final String COLLECTOR_IMAGE =
"otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6";
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc";

private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317;
private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class OtlpPipelineStressTest {
public static final GenericContainer<?> collectorContainer =
new GenericContainer<>(
DockerImageName.parse(
"otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6"))
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc"))
.withImagePullPolicy(PullPolicy.alwaysPull())
.withNetwork(network)
.withNetworkAliases("otel-collector")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private ExporterBenchmark() {}
public abstract static class AbstractProcessorBenchmark {
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
DockerImageName.parse(
"otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6");
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc");
protected static final int OTLP_PORT = 5678;
private static final int HEALTH_CHECK_PORT = 13133;
protected SdkSpanBuilder sdkSpanBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private SpanPipelineBenchmark() {}
public abstract static class AbstractProcessorBenchmark {
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
DockerImageName.parse(
"otel/opentelemetry-collector-contrib:0.157.0@sha256:f2f01157055a9b2aab9df7118e1f1c9abf345e99b23bc7a2bc791db374a7d0f6");
"otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc");
private static final int EXPOSED_PORT = 5678;
private static final int HEALTH_CHECK_PORT = 13133;
private Tracer tracer;
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
id("com.gradle.develocity") version "4.5.0"
id("de.undercouch.download") version "5.7.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
id("org.graalvm.buildtools.native") version "1.1.7"
id("org.graalvm.buildtools.native") version "1.1.9"
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}
}
Expand Down
Loading