Skip to content

Commit 77e78d3

Browse files
committed
Use spring-boot-starter-micrometer-metrics instead of spring-boot-micrometer-metrics directly
Closes gh-2005
1 parent 51fa7c2 commit 77e78d3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityActuatorBuildCustomizer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public void customize(Build build) {
5555
}
5656
if (isBoot4OrLater() && hasPushBasedMetrics(build) && !hasActuator(build)) {
5757
build.dependencies()
58-
.add("spring-boot-micrometer-metrics", "org.springframework.boot", "spring-boot-micrometer-metrics",
59-
DependencyScope.COMPILE);
58+
.add("spring-boot-starter-micrometer-metrics", "org.springframework.boot",
59+
"spring-boot-starter-micrometer-metrics", DependencyScope.COMPILE);
6060
build.dependencies()
61-
.add("spring-boot-micrometer-metrics-test", "org.springframework.boot",
62-
"spring-boot-micrometer-metrics-test", DependencyScope.TEST_COMPILE);
61+
.add("spring-boot-starter-micrometer-metrics-test", "org.springframework.boot",
62+
"spring-boot-starter-micrometer-metrics-test", DependencyScope.TEST_COMPILE);
6363
}
6464
}
6565

start-site/src/test/java/io/spring/start/site/extension/dependency/observability/ObservabilityActuatorBuildCustomizerTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void actuatorIsAddedWithTracingEntriesForBoot4(String dependency) {
5555
void actuatorIsAddedWithPullBasedMetricsEntriesForBoot4(String dependency) {
5656
assertThat(generateProject(SupportedBootVersion.V4_0, dependency)).mavenBuild()
5757
.hasDependency(getDependency("actuator"))
58-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
59-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test");
58+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
59+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test");
6060
}
6161

6262
@ParameterizedTest
@@ -65,16 +65,16 @@ void actuatorIsNotAddedWithPushBasedMetricsEntriesForBoot4(String dependency) {
6565
Dependency actuator = getDependency("actuator");
6666
assertThat(generateProject(SupportedBootVersion.V4_0, dependency)).mavenBuild()
6767
.doesNotHaveDependency(actuator.getGroupId(), actuator.getArtifactId())
68-
.hasDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
69-
.hasDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test", null, "test");
68+
.hasDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
69+
.hasDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test", null, "test");
7070
}
7171

7272
@Test
7373
void shouldNotAddMicrometerMetricsIfActuatorIsThere() {
7474
assertThat(generateProject(SupportedBootVersion.V4_0, "distributed-tracing", "datadog")).mavenBuild()
7575
.hasDependency(getDependency("actuator"))
76-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
77-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test");
76+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
77+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test");
7878
}
7979

8080
private ProjectStructure generateProject(SupportedBootVersion springBootVersion, String... dependencies) {

0 commit comments

Comments
 (0)