Merge branch 'main' into 445-300-m5-actuator-endpoints-sanitization

Author: fabapp2

components/sbm-core/src/test/java/org/springframework/sbm/project/parser/ForgivingParsingOfTestResourcesTest.java

@@ -0,0 +1,59 @@
+/*
+ * 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.project.parser;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.openrewrite.SourceFile;
+import org.openrewrite.yaml.tree.Yaml;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
+import org.springframework.sbm.project.resource.TestProjectContext;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Fabian Krüger
+ */
+public class ForgivingParsingOfTestResourcesTest {
+
+    @Test
+    @DisplayName("Proof that resource with syntax error is excluded from AST but other resources aren't")
+    void test_renameMe() {
+        ProjectContext context = TestProjectContext
+                .buildProjectContext()
+                .addProjectResource("src/test/resources/one.yaml", "valid: true")
+                .addProjectResource("src/test/resources/error.yaml",
+                        """
+                        min-risk-score:
+                          100 # illegal line break
+                        attenuation-duration: !include attenuation-duration_ok.yaml
+                          risk-score-classes: !include risk-score-class_ok.yaml # illegal indentation
+                        exposure-config: !include exposure-config_ok.yaml
+                        """)
+                .addProjectResource("src/test/resources/three.yaml", "is.valid: true")
+                .build();
+
+        List<RewriteSourceFileHolder<? extends SourceFile>> parsedResources = context.getProjectResources().list();
+        assertThat(parsedResources).hasSize(3);
+        assertThat(parsedResources.get(0).getSourcePath().toString()).isEqualTo("pom.xml");
+        assertThat(parsedResources.get(1).getSourcePath().toString()).isEqualTo("src/test/resources/one.yaml");
+        // src/test/resources/error.yaml is ignored
+        assertThat(parsedResources.get(2).getSourcePath().toString()).isEqualTo("src/test/resources/three.yaml");
+    }
+}

components/sbm-recipes-boot-upgrade/pom.xml

@@ -91,7 +91,7 @@
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
-            <version>2.66.0</version>
+            <version>2.67.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

components/sbm-recipes-boot-upgrade/src/main/resources/recipes/27_30/report/sbu30-report.yaml

@@ -73,10 +73,10 @@
         |===
         
         The application was scanned and matched against the changes listed in the
-        https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.5-Release-Notes[Spring Boot 2.5 Release Notes]
+        https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes[Spring Boot 3.0 Release Notes]
         as well as from https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-5.x[Spring Framework 5.x Release Notes].
         
-        The Relevant Changes section lists all potentially required changes to upgrade the scanned application to Spring Boot 2.5.6.
+        The Relevant Changes section lists all potentially required changes to upgrade the scanned application to Spring Boot 3.0.
         
         NOTE: JDK 17 is required for Spring Boot 3
         

pom.xml

@@ -306,7 +306,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
         </dependency>
     </dependencies>
     <modules>