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 { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad265a62..a2957386 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) 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"