Fix merge conflicts

Author: fabapp2

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserIntegrationTest.java

@@ -59,17 +59,6 @@ void parseCheckstyle() {
         assertThat(parsingResult.sourceFiles().stream().map(sf -> sf.getSourcePath().toString()).toList()).contains("checkstyle/rules.xml");
         assertThat(parsingResult.sourceFiles().stream().map(sf -> sf.getSourcePath().toString()).toList()).contains("checkstyle/suppressions.xml");
     }
-    @Test
-    @DisplayName("parse4Modules")
-    void parse4Modules() {
-        Path baseDir = getMavenProject("4-modules");
-        List<Resource> resources = projectScanner.scan(baseDir);
-
-        assertThat(resources).hasSize(4);
-
-        RewriteProjectParsingResult parsingResult = sut.parse(baseDir, resources, new InMemoryExecutionContext(t -> {throw new RuntimeException(t);}));
-        assertThat(parsingResult.sourceFiles()).hasSize(4);
-    }
 
     @Test
     @DisplayName("testFailingProject")
@@ -109,24 +98,6 @@ void parse4Modules() {
         assertThat(parsingResult.sourceFiles()).hasSize(4);
     }
 
-    @Autowired
-    RewriteMavenProjectParser mavenProjectParser;
-
-    @Test
-    @DisplayName("parseResources")
-    void parseResources() {
-        Path baseDir = getMavenProject("resources");
-        List<Resource> resources = projectScanner.scan(baseDir);
-
-        RewriteProjectParsingResult parsingResult1 = mavenProjectParser.parse(baseDir);
-        assertThat(parsingResult1.sourceFiles()).hasSize(5);
-
-        RewriteProjectParsingResult parsingResult = sut.parse(baseDir, resources, new InMemoryExecutionContext(t -> {
-            throw new RuntimeException(t);
-        }));
-        assertThat(parsingResult.sourceFiles()).hasSize(5);
-    }
-
     private Path getMavenProject(String s) {
         return Path.of("./testcode/maven-projects/").resolve(s).toAbsolutePath().normalize();
     }