diff --git a/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManaged.java b/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManaged.java index 1b95b2dc0..40a686bfa 100644 --- a/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManaged.java +++ b/components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManaged.java @@ -43,7 +43,7 @@ public boolean evaluate(ProjectContext context) { .stream() .map(Module::getBuildFile) .anyMatch(b -> { - boolean matchedInDependencies = b.getDeclaredDependencies() + boolean matchedInDependencies = b.getRequestedDependencies() .stream() .anyMatch(matchesSpringBootPattern()); diff --git a/components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java b/components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java index 441b3ff59..56c96cdce 100644 --- a/components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java +++ b/components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/HasSpringBootDependencyManuallyManagedTest.java @@ -191,41 +191,67 @@ public void conditionToBeTrueIfManagedDependencies() { } @Test - public void conditionToBeTrueIfVersionIsDefinedInProperty() { + public void conditionToBeTrueIfVersionIsDefinedInParentPom() { ProjectContext projectContext = TestProjectContext.buildProjectContext() .withMavenRootBuildFileSource(""" - - - 4.0.0 - com.example - explicit-deps-app - 0.0.1-SNAPSHOT - explicit-deps-app - explicit-deps-app - - 2.7.1 - - - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - io.dropwizard.metrics - metrics-annotation - 4.2.8 - - - org.springframework.boot - spring-boot-starter-test - 2.7.3 - test - - - + + + 4.0.0 + pom + com.example + parent-boot-upgrade-27_30 + 0.0.1-SNAPSHOT + parent-boot-upgrade-27_30 + parent-boot-upgrade-27_30 + + 17 + 2.7.3 + + + component1 + + + + spring-milestone + https://repo.spring.io/milestone + + false + + + + + """) + .withMavenBuildFileSource("component1/pom.xml", """ + + + 4.0.0 + + com.example + parent-boot-upgrade-27_30 + 0.0.1-SNAPSHOT + + com.example + explicit-deps-app + 0.0.1-SNAPSHOT + explicit-deps-app + explicit-deps-app + + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + """) .build();