diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/project/resource/TestProjectContext.java b/components/sbm-core/src/test/java/org/springframework/sbm/project/resource/TestProjectContext.java index 6fac6bda5..ed8ba6c80 100644 --- a/components/sbm-core/src/test/java/org/springframework/sbm/project/resource/TestProjectContext.java +++ b/components/sbm-core/src/test/java/org/springframework/sbm/project/resource/TestProjectContext.java @@ -466,11 +466,14 @@ public ProjectContext build() { " dummy-root\n" + " 0.1.0-SNAPSHOT\n" + " jar\n" + - "{{}}\n" + + "{{springParentPom}}\n" + "{{dependencies}}\n" + "\n"; - xml = xml.replace("{{dependencies}}", getDependenciesSection()); + xml = xml + .replace("{{dependencies}}", getDependenciesSection()) + .replace("{{springParentPom}}", getSpringParentPomSection()) + ; resourcesWithRelativePaths.put(Path.of("pom.xml"), xml); @@ -520,6 +523,7 @@ public ProjectContext build() { return projectContext; } + private void orderByOrderAnnotationValue(List resourceWrapperList) { resourceWrapperList.sort(Comparator.comparing(this::getOrder)); } @@ -618,6 +622,23 @@ private String getDependenciesSection() { return dependenciesSection.toString(); } + @NotNull + private String getSpringParentPomSection() { + + if (this.springVersion.isPresent()) { + return """ + + org.springframework.boot + spring-boot-starter-parent + %s + + + """.formatted(this.springVersion.get()); + } + + return ""; + } + public Builder withSpringBootParentOf(String springVersion) { this.springVersion = Optional.of(springVersion); diff --git a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/PagingAndSortingHelperTest.java b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/PagingAndSortingHelperTest.java index 2403f1cc4..d8d69ad16 100644 --- a/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/PagingAndSortingHelperTest.java +++ b/components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/PagingAndSortingHelperTest.java @@ -46,6 +46,7 @@ public class A {} """; ProjectContext context = TestProjectContext.buildProjectContext() + .withSpringBootParentOf("2.7.1") .addJavaSource("src/main/java", javaClassWithPagingAndSortingRepository) .addJavaSource("src/main/java",javaClassWithoutPagingAndSortingRepo) .withBuildFileHavingDependencies("org.springframework.data:spring-data-commons:2.7.1") @@ -105,6 +106,7 @@ public class A {} """; ProjectContext context = TestProjectContext.buildProjectContext() + .withSpringBootParentOf("2.7.1") .addJavaSource("src/main/java", javaClassWithReactiveSortingRepo) .addJavaSource("src/main/java",javaClassWithoutReactiveSortingRepo) .withBuildFileHavingDependencies("org.springframework.data:spring-data-commons:2.7.1") @@ -165,7 +167,7 @@ public class A {} """; ProjectContext context = TestProjectContext.buildProjectContext() - .withSpringBootParentOf("2.7,1") + .withSpringBootParentOf("2.7.1") .addJavaSource("src/main/java", javaClassWithReactiveSortingRepo) .addJavaSource("src/main/java",javaClassWithoutReactiveSortingRepo) .withBuildFileHavingDependencies("org.springframework.data:spring-data-commons:2.7.1") @@ -250,6 +252,7 @@ public class A {} """; ProjectContext context = TestProjectContext.buildProjectContext() + .withSpringBootParentOf("2.7.1") .addJavaSource("src/main/java", javaClassWithPagingAndSortingRepository) .addJavaSource("src/main/java",javaClassWithoutPagingAndSortingRepo) .addJavaSource("src/main/java",javaClassWithReactiveSortingRepo) @@ -309,6 +312,7 @@ public class A {} """; ProjectContext context = TestProjectContext.buildProjectContext() + .withSpringBootParentOf("2.7.1") .addJavaSource("src/main/java",javaClassWithoutPagingAndSortingRepo) .withBuildFileHavingDependencies("org.springframework.data:spring-data-commons:2.7.1") .build();