diff --git a/doc-snippets/extensions-minimal/oats/Dockerfile b/doc-snippets/extensions-minimal/oats/Dockerfile index 21d9e8f50..30c784a6e 100644 --- a/doc-snippets/extensions-minimal/oats/Dockerfile +++ b/doc-snippets/extensions-minimal/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc WORKDIR /usr/src/app/ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b271a646..bd82f36ba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/javaagent-declarative-configuration/oats/Dockerfile b/javaagent-declarative-configuration/oats/Dockerfile index e2081e47e..3de747b5d 100644 --- a/javaagent-declarative-configuration/oats/Dockerfile +++ b/javaagent-declarative-configuration/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc WORKDIR /usr/src/app/ diff --git a/javaagent/Dockerfile b/javaagent/Dockerfile index 78f6150ae..eb3b0fa52 100644 --- a/javaagent/Dockerfile +++ b/javaagent/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc ADD build/libs/app.jar /app.jar ADD build/agent/opentelemetry-javaagent.jar /opentelemetry-javaagent.jar diff --git a/log-appender/build.gradle.kts b/log-appender/build.gradle.kts index 49268acfd..b3fe0126e 100644 --- a/log-appender/build.gradle.kts +++ b/log-appender/build.gradle.kts @@ -15,12 +15,12 @@ java { dependencies { // Slf4J / logback - implementation("org.slf4j:slf4j-api:2.0.17") + implementation("org.slf4j:slf4j-api:2.0.18") implementation("ch.qos.logback:logback-core:1.5.32") implementation("ch.qos.logback:logback-classic:1.5.32") // JUL to SLF4J bridge - implementation("org.slf4j:jul-to-slf4j:2.0.17") + implementation("org.slf4j:jul-to-slf4j:2.0.18") // Log4j implementation(platform("org.apache.logging.log4j:log4j-bom:2.26.0")) diff --git a/logging-k8s-stdout-otlp-json/Dockerfile b/logging-k8s-stdout-otlp-json/Dockerfile index bcaa703ae..114036576 100644 --- a/logging-k8s-stdout-otlp-json/Dockerfile +++ b/logging-k8s-stdout-otlp-json/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc WORKDIR /usr/src/app/ diff --git a/mise.toml b/mise.toml index 0f958fe47..0f5493045 100644 --- a/mise.toml +++ b/mise.toml @@ -2,7 +2,7 @@ lychee = "0.24.2" k3d = "5.8.3" "go:github.com/grafana/oats" = "0.6.1" -kubectl = "1.36.0" +kubectl = "1.36.1" markdownlint-cli2 = "0.22.1" [settings] diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile index f25d70af1..107d89628 100644 --- a/prometheus/Dockerfile +++ b/prometheus/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc ADD build/libs/opentelemetry-examples-prometheus-*-SNAPSHOT-all.jar /app.jar diff --git a/settings.gradle.kts b/settings.gradle.kts index 91c0ff444..0d2ce5584 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ pluginManagement { plugins { - id("com.diffplug.spotless") version "8.5.0" + id("com.diffplug.spotless") version "8.5.1" id("com.gradleup.shadow") version "9.4.1" id("com.google.protobuf") version "0.10.0" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" diff --git a/spring-declarative-configuration/oats/Dockerfile b/spring-declarative-configuration/oats/Dockerfile index 6559cca7a..7108c7f83 100644 --- a/spring-declarative-configuration/oats/Dockerfile +++ b/spring-declarative-configuration/oats/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25.0.3_9-jre@sha256:9c9e7c4f5f3840e5254be62ea9a7de56b2d0af23864032a8a3654bf63c31cd5b +FROM eclipse-temurin:25.0.3_9-jre@sha256:04262e8782d6b034ee5d7c1c5d4e8938fcf2063a76b4bfcd84e5d994d09c27bc WORKDIR /usr/src/app/