Skip to content

Commit 0f14659

Browse files
chore(deps): update plugin org.springframework.boot to v4 (#930)
1 parent e9b0de1 commit 0f14659

8 files changed

Lines changed: 14 additions & 10 deletions

File tree

doc-snippets/exporters/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id("java")
5-
id("org.springframework.boot") version "3.5.8"
5+
id("org.springframework.boot") version "4.0.0"
66
}
77

88
val moduleName by extra { "io.opentelemetry.examples.docs.exporters" }

doc-snippets/getting-started/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id("java")
5-
id("org.springframework.boot") version "3.5.8"
5+
id("org.springframework.boot") version "4.0.0"
66
}
77

88
val moduleName by extra { "io.opentelemetry.examples.docs.getting-started" }

javaagent-declarative-configuration/build.gradle.kts

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

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

99
java {

javaagent/build.gradle.kts

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

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

99
description = "OpenTelemetry Example for Java Agent"

logging-k8s-stdout-otlp-json/build.gradle.kts

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

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

99
description = "OpenTelemetry Example for Java Agent with Stdout logging"

micrometer-shim/build.gradle.kts

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

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

99
description = "OpenTelemetry Example for Micrometer Shim"
@@ -31,5 +31,5 @@ dependencies {
3131
//spring modules
3232
implementation("org.springframework.boot:spring-boot-starter-web")
3333
implementation("org.springframework.boot:spring-boot-starter-actuator")
34-
implementation("org.springframework.boot:spring-boot-starter-aop")
34+
implementation("org.springframework.boot:spring-boot-starter-aspectj")
3535
}

telemetry-testing/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun
44

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

1010
description = "OpenTelemetry Example for Telemetry Testing"
@@ -32,7 +32,9 @@ dependencies {
3232
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.22.0")
3333
//spring modules
3434
implementation("org.springframework.boot:spring-boot-starter-web")
35+
implementation("org.springframework.boot:spring-boot-starter-restclient")
3536
testImplementation("org.springframework.boot:spring-boot-starter-test")
37+
testImplementation("org.springframework.boot:spring-boot-resttestclient")
3638

3739
testImplementation(enforcedPlatform("org.junit:junit-bom:6.0.1"))
3840
testImplementation("org.junit.jupiter:junit-jupiter-api")

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static org.mockserver.model.HttpRequest.request;
88
import static org.mockserver.model.HttpResponse.response;
99
import static org.mockserver.stop.Stop.stopQuietly;
10-
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.*;
10+
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
1111

1212
import com.google.protobuf.InvalidProtocolBufferException;
1313
import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -26,8 +26,9 @@
2626
import org.mockserver.model.Body;
2727
import org.mockserver.model.HttpRequest;
2828
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.boot.resttestclient.TestRestTemplate;
30+
import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
2931
import org.springframework.boot.test.context.SpringBootTest;
30-
import org.springframework.boot.test.web.client.TestRestTemplate;
3132
import org.springframework.boot.test.web.server.LocalServerPort;
3233

3334
/**
@@ -38,6 +39,7 @@
3839
@SpringBootTest(
3940
classes = {Application.class},
4041
webEnvironment = RANDOM_PORT)
42+
@AutoConfigureTestRestTemplate
4143
class ApplicationTest {
4244

4345
@LocalServerPort private int port;

0 commit comments

Comments
 (0)