Merge branch 'main' into 503-springbootupgradereporttestsupport-provides-assertion-for-section-not-rendered

Author: fabapp2

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

@@ -56,6 +56,22 @@ void migrateSimpleApplication() {
         verifyAutoConfigurationIsRefactored();
         verifyEhCacheVersionIsUpgraded();
         verifyJohnzonCoreDependencyIsUpgraded();
+        verifySpringCloudDependency();
+    }
+
+    private void verifySpringCloudDependency() {
+
+        assertThat(getProperty("spring-cloud.version")).isEqualTo("2022.0.0-M4");
+    }
+
+    private String getProperty(String property) {
+        return getRootBuildFile()
+                .getMarkers()
+                .findFirst(MavenResolutionResult.class)
+                .get()
+                .getPom()
+                .getProperties()
+                .get(property);
     }
 
     private void buildProject() {

applications/spring-shell/src/test/resources/testcode/boot-migration-27-30/pom.xml

@@ -15,6 +15,7 @@
     <description>boot-upgrade-27_30</description>
     <properties>
         <java.version>17</java.version>
+        <spring-cloud.version>2021.0.4</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -54,7 +55,17 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <repositories>
         <repository>
             <id>spring-snapshot</id>

components/sbm-openrewrite/src/test/java/org/openrewrite/java/ChangeTypeTest.java

@@ -31,6 +31,22 @@
         id: "spring-milestone"
         url: "https://repo.spring.io/milestone"
 
+    - type: org.springframework.sbm.engine.recipe.OpenRewriteDeclarativeRecipeAdapter
+      condition:
+        type: org.springframework.sbm.boot.common.conditions.IsSpringBootProject
+        versionPattern: "2\\.7\\..*|3\\.0\\..*"
+      description: Upgrade Spring Cloud Dependencies
+      openRewriteRecipe: |-
+        type: specs.openrewrite.org/v1beta/recipe
+        name: org.openrewrite.java.spring.boot3.data.UpgradeSpringCloudDependencies
+        displayName: Upgrade to Spring Cloud
+        description: 'Upgrade to Spring Cloud to version 2022.0.0-M4'
+        recipeList:
+          - org.openrewrite.maven.UpgradeDependencyVersion:
+              groupId: org.springframework.cloud
+              artifactId: spring-cloud-dependencies
+              newVersion: 2022.0.0-M4
+
     -  type: org.springframework.sbm.boot.upgrade.common.actions.CreateAutoconfigurationAction
        description: Move EnableAutoConfiguration Property from spring.factories to AutoConfiguration.imports
        snapshotsEnabled: false