diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1de574d7a..532a8b3a8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,12 +28,6 @@ "matchPackagePrefixes": ["com.google.protobuf"], "groupName": "protobuf packages" }, - { - // intentionally using Spring Boot 2 in some examples - "matchPackageNames": ["org.springframework.boot"], - "matchUpdateTypes": ["major"], - "enabled": false - }, { // intentionally using Java 11 in some examples // not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre" diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 9252c7200..f7ca3082d 100644 --- a/javaagent/build.gradle.kts +++ b/javaagent/build.gradle.kts @@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Java Agent" val moduleName by extra { "io.opentelemetry.examples.javagent" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - val agent = configurations.create("agent") val extension = configurations.create("extension") diff --git a/micrometer-shim/build.gradle.kts b/micrometer-shim/build.gradle.kts index fae70dcd8..30bf27ba5 100644 --- a/micrometer-shim/build.gradle.kts +++ b/micrometer-shim/build.gradle.kts @@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Micrometer Shim" val moduleName by extra { "io.opentelemetry.examples.micrometer-shim" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - val bootRun = tasks.named("bootRun") { mainClass = "io.opentelemetry.example.micrometer.Application" } diff --git a/telemetry-testing/build.gradle.kts b/telemetry-testing/build.gradle.kts index 3f6410734..5dff207df 100644 --- a/telemetry-testing/build.gradle.kts +++ b/telemetry-testing/build.gradle.kts @@ -4,18 +4,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun plugins { id("java") - id("org.springframework.boot") version "2.7.18" + id("org.springframework.boot") version "3.3.5" } description = "OpenTelemetry Example for Telemetry Testing" val moduleName by extra { "io.opentelemetry.examples.telemetry-testing" } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } -} - val bootRun = tasks.named("bootRun") { mainClass = "io.opentelemetry.example.javagent.Application" } @@ -37,7 +31,7 @@ dependencies { testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.3")) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-engine") - testImplementation("org.mock-server:mockserver-netty:5.15.0:shaded") + testImplementation("org.mock-server:mockserver-netty:5.15.0") testImplementation("org.awaitility:awaitility:4.2.2") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha") testImplementation("org.assertj:assertj-core:3.26.3") diff --git a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java index 15195f867..75c501877 100644 --- a/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java +++ b/telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; /** * The role of this class is to test the telemetry. It only works if the opentelemetry java agent is