Skip to content

Commit f2e9e6a

Browse files
renovate[bot]trask
andauthored
chore(deps): update plugin org.springframework.boot to v3 (#456)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 9465564 commit f2e9e6a

File tree

5 files changed

+5
-29
lines changed

5 files changed

+5
-29
lines changed

.github/renovate.json5

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
"matchPackagePrefixes": ["com.google.protobuf"],
2929
"groupName": "protobuf packages"
3030
},
31-
{
32-
// intentionally using Spring Boot 2 in some examples
33-
"matchPackageNames": ["org.springframework.boot"],
34-
"matchUpdateTypes": ["major"],
35-
"enabled": false
36-
},
3731
{
3832
// intentionally using Java 11 in some examples
3933
// not using matchUpdateTypes "major", because renovate wants to bump "11-jre" to "11.0.19_7-jre"

javaagent/build.gradle.kts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
33

44
plugins {
55
id("java")
6-
id("org.springframework.boot") version "2.7.18"
6+
id("org.springframework.boot") version "3.3.5"
77
}
88

99
description = "OpenTelemetry Example for Java Agent"
1010
val moduleName by extra { "io.opentelemetry.examples.javagent" }
1111

12-
java {
13-
toolchain {
14-
languageVersion.set(JavaLanguageVersion.of(8))
15-
}
16-
}
17-
1812
val agent = configurations.create("agent")
1913
val extension = configurations.create("extension")
2014

micrometer-shim/build.gradle.kts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun
33

44
plugins {
55
id("java")
6-
id("org.springframework.boot") version "2.7.18"
6+
id("org.springframework.boot") version "3.3.5"
77
}
88

99
description = "OpenTelemetry Example for Micrometer Shim"
1010
val moduleName by extra { "io.opentelemetry.examples.micrometer-shim" }
1111

12-
java {
13-
toolchain {
14-
languageVersion.set(JavaLanguageVersion.of(8))
15-
}
16-
}
17-
1812
val bootRun = tasks.named<BootRun>("bootRun") {
1913
mainClass = "io.opentelemetry.example.micrometer.Application"
2014
}

telemetry-testing/build.gradle.kts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ import org.springframework.boot.gradle.tasks.run.BootRun
44

55
plugins {
66
id("java")
7-
id("org.springframework.boot") version "2.7.18"
7+
id("org.springframework.boot") version "3.3.5"
88
}
99

1010
description = "OpenTelemetry Example for Telemetry Testing"
1111
val moduleName by extra { "io.opentelemetry.examples.telemetry-testing" }
1212

13-
java {
14-
toolchain {
15-
languageVersion.set(JavaLanguageVersion.of(11))
16-
}
17-
}
18-
1913
val bootRun = tasks.named<BootRun>("bootRun") {
2014
mainClass = "io.opentelemetry.example.javagent.Application"
2115
}
@@ -37,7 +31,7 @@ dependencies {
3731
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
3832
testImplementation("org.junit.jupiter:junit-jupiter-api")
3933
testImplementation("org.junit.jupiter:junit-jupiter-engine")
40-
testImplementation("org.mock-server:mockserver-netty:5.15.0:shaded")
34+
testImplementation("org.mock-server:mockserver-netty:5.15.0")
4135
testImplementation("org.awaitility:awaitility:4.2.2")
4236
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.3.2-alpha")
4337
testImplementation("org.assertj:assertj-core:3.26.3")

telemetry-testing/src/test/java/io/opentelemetry/example/telemetry/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.beans.factory.annotation.Autowired;
2929
import org.springframework.boot.test.context.SpringBootTest;
3030
import org.springframework.boot.test.web.client.TestRestTemplate;
31-
import org.springframework.boot.web.server.LocalServerPort;
31+
import org.springframework.boot.test.web.server.LocalServerPort;
3232

3333
/**
3434
* The role of this class is to test the telemetry. It only works if the opentelemetry java agent is

0 commit comments

Comments
 (0)