Fix initialise spring boot integration test

* Fix spring-projects-experimental#457 - Enhance initialize spring boot integration test
- Add `application.properties` to multi-module project setup
- Fix whitespaces and remove comments in testcode to match textual content with migrated code
- Fix file path when comparing testcode and migrated code

* Fix spring-projects-experimental#284 - Add version to spring-boot-maven-plugin

Author: ahmedmq

components/recipe-test-support/src/main/java/org/springframework/sbm/test/RecipeIntegrationTestSupport.java

@@ -133,12 +133,11 @@ public void andApplyRecipeComparingWithExpected(String recipeName) {
             try (Stream<Path> walk = Files.walk(expectedProject)) {
                 result = walk.filter(Files::isRegularFile)
                         .map(f -> expectedProject.relativize(f))
-                        .filter(f -> f.toString().startsWith("target/"))
                         .collect(Collectors.toList());
             }
 
             result.stream()
-                    .forEach(r -> assertThat(r).hasSameTextualContentAs(migratedProject.resolve(r)));
+                    .forEach(r -> assertThat(expectedProject.resolve(r)).hasSameTextualContentAs(migratedProject.resolve(r)));
         } catch (Exception exception) {
             throw new RuntimeException(exception);
         }

components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/actions/AddSpringBootApplicationPropertiesAction.java

@@ -16,7 +16,11 @@
 package org.springframework.sbm.boot.properties.actions;
 
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
 import org.springframework.sbm.boot.properties.api.SpringBootApplicationProperties;
 import org.springframework.sbm.boot.properties.search.SpringBootApplicationPropertiesResourceListFilter;
 import org.springframework.sbm.build.api.Module;
@@ -27,6 +31,9 @@
 
 @NoArgsConstructor
 @AllArgsConstructor
+@Getter
+@Setter
+@SuperBuilder
 public class AddSpringBootApplicationPropertiesAction extends AbstractAction {
 
     public static final Path APPLICATION_PROPERTIES_PATH = Path.of("src/main/resources/application.properties");

components/sbm-support-boot/src/main/resources/recipes/initialize-spring-boot-migration.yaml

@@ -91,6 +91,7 @@
       plugin:
         groupId: org.springframework.boot
         artifactId: spring-boot-maven-plugin
+        version: 2.7.3
       condition:
         type: org.springframework.sbm.build.migration.conditions.MavenPluginDoesNotExist
         plugin:
@@ -108,11 +109,13 @@
                   <plugin>
                       <groupId>org.springframework.boot</groupId>
                       <artifactId>spring-boot-maven-plugin</artifactId>
+                      <version>2.7.3</version>
                   </plugin>
               </plugins>
           </build>
 
     - type: org.springframework.sbm.boot.properties.actions.AddSpringBootApplicationPropertiesAction
+      addDefaultPropertiesFileToTopModules: true
       condition:
         type: org.springframework.sbm.boot.properties.conditions.NoSpringBootApplicationPropertiesExists
       description: Create application.properties file.

components/sbm-support-boot/src/main/resources/templates/minimal-pom-xml.ftl

@@ -7,8 +7,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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>

components/sbm-support-boot/testcode/empty-project/expected/pom.xml

@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2021 - 2022 the original author or authors.
+  ~ Copyright 2021 VMware, Inc.
+  ~ SPDX-License-Identifier: Apache License 2.0
   ~
-  ~ 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.
+  ~ @author: fkrueger
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -32,7 +23,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.6.3</version>
+                <version>2.7.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -54,6 +45,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.3</version>
             </plugin>
         </plugins>
     </build>

components/sbm-support-boot/testcode/empty-project/expected/src/main/java/com/boot/migrator/SpringBootApp.java renamed to components/sbm-support-boot/testcode/empty-project/expected/src/main/java/org/springframework/sbm/SpringBootApp.java

@@ -1,4 +1,4 @@
-package com.boot.migrator;
+package org.springframework.sbm;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

components/sbm-support-boot/testcode/empty-project/expected/src/main/resources/application.properties

@@ -1,16 +0,0 @@
-#
-# 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.
-#
-

components/sbm-support-boot/testcode/empty-project/expected/src/test/java/com/boot/migrator/SpringBootAppTest.java renamed to components/sbm-support-boot/testcode/empty-project/expected/src/test/java/org/springframework/sbm/SpringBootAppTest.java

@@ -1,4 +1,4 @@
-package com.boot.migrator;
+package org.springframework.sbm;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

components/sbm-support-boot/testcode/multi-module-simple/expected/module1/pom.xml

@@ -54,6 +54,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.7.3</version>
             </plugin>
         </plugins>
     </build>

components/sbm-support-boot/testcode/multi-module-simple/expected/pom.xml

@@ -36,7 +36,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.6.3</version>
+                <version>2.7.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>