From 6d4233c8ba110a480f674031a0161e5af8eb437b Mon Sep 17 00:00:00 2001 From: "elastic-renovate-prod[bot]" <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Date: Sat, 15 Mar 2025 02:56:25 +0000 Subject: [PATCH 1/3] fix(deps): update dependency org.junit:junit-bom to v5.12.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 893c6443..a5c8d9b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ shadow = "8.3.6" jib = "3.4.4" spotless = "7.0.2" -junit = "5.11.4" +junit = "5.12.1" autoservice = "1.1.1" # otel protocol (OTLP) From 27b182dc516ad49e4259357f294656e69e94d9c0 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:41:19 +0100 Subject: [PATCH 2/3] increase timeout --- jvmti-access/jni-build/jni_linux_musl_x64.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jvmti-access/jni-build/jni_linux_musl_x64.Dockerfile b/jvmti-access/jni-build/jni_linux_musl_x64.Dockerfile index 12b9ea97..8be2b161 100644 --- a/jvmti-access/jni-build/jni_linux_musl_x64.Dockerfile +++ b/jvmti-access/jni-build/jni_linux_musl_x64.Dockerfile @@ -9,7 +9,7 @@ ENV CROSS_TRIPLE x86_64-linux-musl ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}-cross RUN mkdir -p ${XCC_PREFIX} -RUN curl --max-time 60 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz +RUN curl --max-time 180 --retry 5 -LO http://musl.cc/${CROSS_TRIPLE}-cross.tgz # Verify that the downloaded file has not been altered via sha256 checksum RUN test "$(sha256sum -b ${CROSS_TRIPLE}-cross.tgz)" = "c5d410d9f82a4f24c549fe5d24f988f85b2679b452413a9f7e5f7b956f2fe7ea *${CROSS_TRIPLE}-cross.tgz" From 3235d28da325b46d2a3a56b5ff78ea9f58891dfb Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 17 Mar 2025 15:10:01 +0100 Subject: [PATCH 3/3] add missing junit runtime dependency --- .../src/main/kotlin/elastic-otel.java-conventions.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/buildSrc/src/main/kotlin/elastic-otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/elastic-otel.java-conventions.gradle.kts index 367f3e1e..35c7369b 100644 --- a/buildSrc/src/main/kotlin/elastic-otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/elastic-otel.java-conventions.gradle.kts @@ -35,6 +35,7 @@ dependencies { testImplementation(catalog.findLibrary("mockito").get()) testImplementation(enforcedPlatform(catalog.findLibrary("junitBom").get())) testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } tasks {