Remove @component and declare using @bean

sbm-support-rewrite/src/main/java/org/springframework/sbm/boot/autoconfigure/ProjectResourceSetConfiguration.java

@@ -53,4 +53,5 @@ ProjectResourceSetSerializer projectResourceSetSerializer(ProjectResourceSeriali
     ProjectResourceSetFactory projectResourceSetFactory(RewriteMigrationResultMerger rewriteMigrationResultMerger, RewriteSourceFileWrapper sourceFileWrapper, ExecutionContext executionContext) {
         return new ProjectResourceSetFactory(rewriteMigrationResultMerger, sourceFileWrapper, executionContext);
     }
+
 }

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/MavenPasswordDecrypter.java

@@ -32,7 +32,6 @@
  *
  * @author Fabian Krüger
  */
-@Component
 @RequiredArgsConstructor
 // TODO: should be package private
 public class MavenPasswordDecrypter {

sbm-support-rewrite/src/main/java/org/springframework/sbm/parsers/RewriteParserConfiguration.java

@@ -30,6 +30,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.sbm.boot.autoconfigure.ParserPropertiesPostProcessor;
 import org.springframework.sbm.parsers.events.RewriteParsingEventListenerAdapter;
+import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.scopes.ProjectMetadata;
 import org.springframework.sbm.scopes.ScanScope;
 import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
@@ -48,7 +49,7 @@
  */
 @Slf4j
 @AutoConfiguration(after = {ScopeConfiguration.class})
-@EnableConfigurationProperties(ParserProperties.class)
+@EnableConfigurationProperties({ParserProperties.class, SbmApplicationProperties.class})
 @Import({ScanScope.class, ScopeConfiguration.class})
 public class RewriteParserConfiguration {
 
@@ -60,6 +61,11 @@ public class RewriteParserConfiguration {
 //        return new ProvenanceMarkerFactory(projectParserFactory);
 //    }
 
+    @Bean
+    MavenPasswordDecrypter mavenPasswordDecrypter() {
+        return new MavenPasswordDecrypter();
+    }
+
     @Bean
     MavenProvenanceMarkerFactory mavenProvenanceMarkerFactory() {
         return new MavenProvenanceMarkerFactory();

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/RewriteSourceFileWrapper.java

@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Component
 public class RewriteSourceFileWrapper {
 
     public List<RewriteSourceFileHolder<? extends SourceFile>> wrapRewriteSourceFiles(Path absoluteProjectDir, List<SourceFile> parsedByRewrite) {

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSerializer.java

@@ -15,14 +15,11 @@
  */
 package org.springframework.sbm.project.resource;
 
-import org.springframework.stereotype.Component;
-
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-@Component
 public class ProjectResourceSerializer {
 
     public void writeChanges(InternalProjectResource projectResource) {

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetHolder.java

@@ -21,7 +21,7 @@
 
 import java.util.ArrayList;
 
-@Component
+// TODO: Making ProjectResourceSet a scoped bean would allow to remove this class.
 @RequiredArgsConstructor
 public class ProjectResourceSetHolder {
     private ProjectResourceSet projectResourceSet;

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/ProjectResourceSetSerializer.java

@@ -18,7 +18,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
-@Component
 @RequiredArgsConstructor
 public class ProjectResourceSetSerializer {
 

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/RewriteMigrationResultMerger.java

@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Optional;
 
-@Component
 @RequiredArgsConstructor
 public class RewriteMigrationResultMerger {
 

sbm-support-rewrite/src/main/java/org/springframework/sbm/project/resource/SbmApplicationProperties.java

@@ -26,7 +26,6 @@
 
 @Setter
 @Getter
-@Component
 @ConfigurationProperties(prefix = "sbm")
 public class SbmApplicationProperties {
     private boolean gitSupportEnabled;