Use unified IsSpringBootProject condition

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/actions/Boot_24_25_UpgradeReportAction.java

@@ -16,37 +16,19 @@
 package org.springframework.sbm.boot.upgrade_24_25.actions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import org.springframework.sbm.boot.common.conditions.IsSpringBootProject;
 import org.springframework.sbm.boot.upgrade.common.UpgradeReportUtil;
-import org.springframework.sbm.boot.upgrade.common.conditions.IsMatchingSpringBootVersion;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.boot.UpgradeSectionBuilder;
 import org.springframework.sbm.boot.asciidoctor.Section;
-import org.springframework.sbm.boot.upgrade_24_25.report.*;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.java.api.JavaSource;
 import org.springframework.sbm.project.resource.StringProjectResource;
 import freemarker.template.Configuration;
-import freemarker.template.Template;
 import lombok.Getter;
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.Options;
-import org.asciidoctor.SafeMode;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.sbm.boot.UpgradeSectionBuilder;
-import org.springframework.sbm.boot.asciidoctor.Section;
 import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_Introduction;
-import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_SchemaSqlAndDataSqlFiles;
-import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_SeparateCredentials;
-import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_SpringDataJpa;
-import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_SqlScriptDataSourceInitialization;
-import org.springframework.sbm.boot.upgrade_24_25.report.Boot_24_25_UpdateDependencies;
-import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.engine.recipe.AbstractAction;
-import org.springframework.sbm.java.api.JavaSource;
-import org.springframework.sbm.project.resource.StringProjectResource;
 
-import java.io.StringWriter;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -88,7 +70,10 @@ public void apply(ProjectContext projectContext) {
     @Override
     public boolean isApplicable(ProjectContext context) {
         // Verify it's a 2.4.x Spring Boot project
-        return new IsMatchingSpringBootVersion("2.4.").evaluate(context);
+        IsSpringBootProject isSpringBootProject = new IsSpringBootProject();
+        isSpringBootProject.setVersionPattern("2\\.4\\..*");
+
+        return isSpringBootProject.evaluate(context);
     }
 
     @Getter

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.4-2.5-upgrade-report.yaml

@@ -1,10 +1,10 @@
 - name: boot-2.4-2.5-upgrade-report
   description: Create Upgrade Report for a Spring Boot 2.4 Application
   condition:
-    type: org.springframework.sbm.boot.upgrade.common.conditions.IsAnyMatchingSpringBootVersion
-    versionPatterns: 2.4.,2.5.
+    type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
+    versionPattern: "2\\.4\\..*|2\\.5\\..*"
   actions:
     - type: org.springframework.sbm.boot.upgrade_24_25.actions.Boot_24_25_UpgradeReportAction
       description: Create Upgrade Report for a Spring Boot 2.4 Application
       condition:
-        type: org.springframework.sbm.common.migration.conditions.TrueCondition
+        type: org.springframework.sbm.common.migration.conditions.TrueCondition

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/boot-2.7-3.0-upgrade-report.yaml

@@ -1,8 +1,8 @@
 - name: boot-2.7-3.0-upgrade-report
   description: Create a report for Spring Boot Upgrade from 2.7.x to 3.0.0-M3
   condition:
-    type: org.springframework.sbm.boot.upgrade.common.conditions.IsAnyMatchingSpringBootVersion
-    versionPatterns: 2.7.,3.0.
+    type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
+    versionPattern: "2\\.7\\..*|3\\.0\\..*"
 
   actions:
     - type: org.springframework.sbm.boot.upgrade_27_30.SpringBoot30UpgradeReport
@@ -17,4 +17,4 @@
     - type: org.springframework.sbm.boot.upgrade_27_30.actions.Boot_27_30_AddLoggingDateFormat
       description: "Sets logging date format to yyyy-MM-dd HH:mm:ss.SSS"
       condition:
-        type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition
+        type: org.springframework.sbm.boot.upgrade_27_30.conditions.LoggingDateFormatCondition

components/sbm-support-boot/src/test/java/org/springframework/sbm/boot/common/conditions/IsSpringBootProjectTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.sbm.boot.common.conditions;
+
+import org.intellij.lang.annotations.Language;
+import org.junit.jupiter.api.Test;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.project.resource.TestProjectContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class IsSpringBootProjectTest {
+    @Test
+    public void worksWithDependencyManagement() {
+
+        IsSpringBootProject target = new IsSpringBootProject();
+        target.setVersionPattern("2\\.7\\..*");
+
+        @Language("xml")
+        String pomXml = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+                	<modelVersion>4.0.0</modelVersion>
+                	<groupId>com.example</groupId>
+                	<artifactId>demo</artifactId>
+                	<version>0.0.1-SNAPSHOT</version>
+                	<dependencyManagement>
+                		<dependencies>
+                			<dependency>
+                				<groupId>org.springframework.boot</groupId>
+                				<artifactId>spring-boot-dependencies</artifactId>
+                				<version>2.7.4</version>
+                				<type>pom</type>
+                				<scope>import</scope>
+                			</dependency>
+                		</dependencies>
+                	</dependencyManagement>
+                </project>
+                """;
+        ProjectContext context = TestProjectContext.buildProjectContext()
+                .withMavenRootBuildFileSource(pomXml)
+                .build();
+        boolean result = target.evaluate(context);
+
+        assertThat(result).isTrue();
+    }
+}