Merge branch 'main' into 585-move-auto-config-registration-to-new-upgrade-report

Author: fabapp2

README.adoc

@@ -3,11 +3,12 @@
 
 image:https://img.shields.io/github/license/spring-projects-experimental/spring-boot-migrator[GitHub]
 image:https://img.shields.io/github/v/release/spring-projects-experimental/spring-boot-migrator[GitHub release (latest by date)]
-image:https://img.shields.io/github/downloads/spring-projects-experimental/spring-boot-migrator/0.12.0/total[GitHub release (latest by date)]
+image:https://img.shields.io/github/downloads/spring-projects-experimental/spring-boot-migrator/0.13.0/total[GitHub release (latest by date)]
+image:https://img.shields.io/youtube/channel/views/UC6NuSiwpvI32YTcdIflObPQ?logo=youtube&style=flat-square[YouTube Channel Views]
 
 image:https://img.shields.io/badge/Join-Slack-green?logo=slack&color=007EC6&style=for-the-badge[link="https://join.slack.com/t/springbootmigrator/shared_invite/zt-1k6yxfi3b-MEQ_MM67qXufWtc~Tw6y9w"]
 image:https://img.shields.io/github/discussions/spring-projects-experimental/spring-boot-migrator?label=GitHub%20discussions&logo=GitHUb&style=for-the-badge[GitHub Discussions]
-image:https://img.shields.io/gitter/room/spring-boot-migrator/community?color=007EC6&logo=gitter&style=for-the-badge[Gitter]
+image:https://img.shields.io/gitter/room/spring-boot-migrator/community?color=007EC6&logo=gitter&style=for-the-badge[link="https://gitter.im/spring-boot-migrator/community"]
 
 [quote]
 ____
@@ -24,32 +25,55 @@ ____
 
 
 == Spring Boot 3.0 Upgrades
-
 We are working on automated upgrade from Spring Boot 2.7 to Spring Boot 3.0.
 
+Click the image to watch a demo video [2:26]
+
+ifdef::env-github[]
+image:https://img.youtube.com/vi/RKXblzn8lFg/maxresdefault.jpg[link=https://www.youtube.com/embed/RKXblzn8lFg]
+endif::[]
+
+=== Try the Spring Boot Upgrade tool
+. Download the https://github.com/spring-projects-experimental/spring-boot-migrator/releases/download/latest/spring-boot-upgrade.jar[spring-boot-upgrade.jar]
+. Run `java -jar --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED spring-boot-upgrade.jar <path-to-application>`
+
 If any of your applications is on 2.7 and uses Maven (Gradle is currently not supported), we'd be happy if you
 could give SBM a try and provide feedback of how it worked out.
 It is very hard to come up with all the possible setups found in the wild and therefor we need you - the community - to provide feedback to stabilize the recipe.
 
 Thank you!
 
-Download the https://github.com/spring-projects-experimental/spring-boot-migrator/releases[latest release]
-
-- Start SBM: `java -jar spring-boot-migrator.jar`
-- Scan your application: `scan <path to application>`
-- generate a report first: `apply boot-2.7-3.0-upgrade-report`
-- Run the migration: `apply boot-2.7-3.0-dependency-version-update`
-
 === Contributing
-
 Any contribution is appreciated!
-If you want to get involved, please have a look at https://github.com/spring-projects-experimental/spring-boot-migrator/discussions/446[this discussion] where we provide additional information related to the Spring Boot 3 Upgrade.
+If you want to get involved, please have a look at https://github.com/spring-projects-experimental/spring-boot-migrator/wiki/Spring-Boot-3-Upgrade-Report-Contribution-Guideline[Spring Boot 3 Upgrade Report Contribution Guideline] where we provide information related to contributing to the Spring Boot 3 Upgrade.
 Please don't hesitate to ask questions and provide feedback.
 
+Find the list of Spring Boot 3 Upgrade related issues labeled as `good first issue` https://github.com/spring-projects-experimental/spring-boot-migrator/issues?q=is%3Aissue+is%3Aopen+label%3A3.0.0+label%3A%22good+first+issue%22+[here]
+
 If you decided you want to work on an issue, leave a comment letting us know that you want to work on it and we go from there.
 
 Thank you!
 
+== JEE to Spring Boot Migration
+Spring Boot Migrator offers recipes to migrate JEE applications to Spring Boot.
+
+These specifications are covered (to some extent and varying completeness)
+
+* Servlet
+* JAX-RS
+* SOAP
+* JMS
+* EJB
+* JPA
+* ejb-jar.xml
+* weblogic-ejb-jar.xml
+
+Click the image to watch a demo video [16:57]
+
+ifdef::env-github[]
+image:https://img.youtube.com/vi/PnvsLafekWE/maxresdefault.jpg[link=https://www.youtube.com/embed/PnvsLafekWE]
+endif::[]
+
 == How SBM works
 
 Spring Boot Migrator uses and is compatible with https://github.com/openrewrite/rewrite[OpenRewrite,window=_blank],
@@ -74,7 +98,7 @@ image::images/apply.png[]
 
 == Getting started
 
-* Download the latest release from here: https://github.com/spring-projects-experimental/spring-boot-migrator/releases[Spring Boot Migrator Releases]
+* Download the latest release from here: https://github.com/spring-projects-experimental/spring-boot-migrator/releases/latest[Spring Boot Migrator Releases]
 * Start the application: `java -jar spring-boot-migrator.jar`
 * In the CLI start by scanning the application `scan <path-to-application>`
 * From the list of applicable recipes select the one you want to apply, +

components/openrewrite-spring-recipes/src/main/java/org/springframework/sbm/MigrateBoot23To24Recipe.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm;
 
 import org.springframework.sbm.engine.recipe.UserInteractions;
-import org.springframework.sbm.build.migration.conditions.AnyDependencyExistMatchingRegex;
+import org.springframework.sbm.build.migration.conditions.AnyDeclaredDependencyExistMatchingRegex;
 import org.springframework.sbm.engine.recipe.Action;
 import org.springframework.sbm.engine.recipe.Recipe;
 import org.springframework.sbm.spring.migration.actions.InitDataSourceAfterJpaInitAction;
@@ -40,7 +40,7 @@ private Recipe createSpringBootUpgradeRecipe(String fromVersion, String toVersio
         return Recipe.builder()
                 .name("migrate-boot-" + fromVersion + "-" + toVersion)
                 .description("Migrate from Spring Boot " + fromVersion + " to " + toVersion)
-                .condition(AnyDependencyExistMatchingRegex.builder()
+                .condition(AnyDeclaredDependencyExistMatchingRegex.builder()
                         .dependencies(List.of("org\\.springframework\\.boot:.*:" + fromVersion.replace(".", "\\.") + ".*"))
                         .build()
                 )

components/openrewrite-spring-recipes/src/main/java/org/springframework/sbm/OrRecipesConfig.java

@@ -19,7 +19,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.sbm.build.impl.OpenRewriteMavenBuildFile;
-import org.springframework.sbm.build.migration.conditions.AnyDependencyExistMatchingRegex;
+import org.springframework.sbm.build.migration.conditions.AnyDeclaredDependencyExistMatchingRegex;
 import org.springframework.sbm.build.migration.recipe.RemoveMavenPlugin;
 import org.springframework.sbm.engine.recipe.Action;
 import org.springframework.sbm.engine.recipe.Condition;
@@ -71,7 +71,7 @@ Recipe recipeSpringBoot1To2Migration(RewriteRecipesRepository repo) {
         r.doNext(new AddPluginDependency("ro.isdc.wro4j", "wro4j-maven-plugin", "org.mockito", "mockito-core", "${mockito.version}"));
         r.doNext(new OpenRewriteMavenBuildFile.RefreshPomModel());
 
-        AnyDependencyExistMatchingRegex condition = new AnyDependencyExistMatchingRegex();
+        AnyDeclaredDependencyExistMatchingRegex condition = new AnyDeclaredDependencyExistMatchingRegex();
         condition.setDependencies(List.of("org\\.springframework\\.boot:.*:1\\..*"));
 
         return createRecipe("upgrade-boot-1x-to-2x", r, condition);

components/sbm-core/pom.xml

@@ -154,7 +154,13 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+			<version>2.14.1</version>
+		</dependency>
+
+	</dependencies>
     <build>
         <plugins>
             <plugin>

components/sbm-core/src/main/java/org/springframework/sbm/build/api/BuildFile.java

@@ -16,10 +16,12 @@
 package org.springframework.sbm.build.api;
 
 import org.openrewrite.maven.tree.Scope;
+
 import org.springframework.sbm.project.resource.ProjectResource;
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -47,18 +49,18 @@ public interface BuildFile extends ProjectResource {
     Set<Dependency> getEffectiveDependencies();
 
     /**
-     * Check if any declared dependency matches any of the given regex.
+     * Check if any dependency declared in this build file matches any of the given regex.
      *
      * @param dependencyPatterns the patterns matching against Maven coordinates 'groupId:artifactId:version'
      */
     boolean hasDeclaredDependencyMatchingRegex(String... dependencyPatterns);
 
     /**
-     * Check if any dependency (declared or transitive) matches any of the given regex.
+     * Check if any dependency declared or transitive in any scope in this build file matches any of the given regex.
      *
      * @param dependencyPatterns the patterns matching against Maven coordinates 'groupId:artifactId:version'
      */
-//    boolean hasDependencyMatchingRegex(String... dependencyPatterns);
+    boolean hasEffectiveDependencyMatchingRegex(String... dependencyPatterns);
 
     boolean hasExactDeclaredDependency(Dependency dependency);
 
@@ -117,6 +119,8 @@ public interface BuildFile extends ProjectResource {
 
     String getProperty(String key);
 
+	void deleteProperty(String key);
+
     String print();
 
     /**
@@ -165,4 +169,7 @@ public interface BuildFile extends ProjectResource {
     List<RepositoryDefinition> getPluginRepositories();
 
     List<String> getDeclaredModules();
+
+	Optional<Plugin> findPlugin(String groupId, String artifactId);
+
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/api/Plugin.java

@@ -15,47 +15,46 @@
  */
 package org.springframework.sbm.build.api;
 
-import lombok.*;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public interface Plugin {
+
+	String getGroupId();
+
+	String getArtifactId();
+
+	String getVersion();
+
+	String getDependencies();
+
+	List<? extends Execution> getExecutions();
+
+	Configuration getConfiguration();
+
+	interface Configuration {
+
+		Optional<String> getDeclaredStringValue(String property);
+
+		String getResolvedStringValue(String property);
+
+		void setDeclaredStringValue(String property, String value);
+
+		Set<String> getPropertyKeys();
+
+	}
+
+	interface Execution {
+
+		String getId();
+
+		List<String> getGoals();
+
+		String getPhase();
+
+		String getConfiguration();
+
+	}
 
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Plugin {
-
-    @NotNull
-    private String groupId;
-
-    @NotNull
-    private String artifactId;
-
-    private String version;
-
-    @Singular("execution")
-    private List<Execution> executions;
-
-    private String configuration;
-
-    private String dependencies;
-
-    @Builder
-    @Getter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Setter
-    public static class Execution {
-        @Null
-        private String id;
-        @Singular("goal")
-        private List<String> goals;
-        @Null
-        private String phase;
-        @Null
-        private String configuration;
-    }
-}
+}

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/Refactoring.java renamed to components/sbm-core/src/main/java/org/springframework/sbm/build/impl/MavenBuildFileRefactoring.java

@@ -23,14 +23,13 @@
 import org.openrewrite.xml.tree.Xml;
 import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.support.openrewrite.GenericOpenRewriteRecipe;
-import org.springframework.util.ReflectionUtils;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @RequiredArgsConstructor
-class Refactoring<P> {
+class MavenBuildFileRefactoring<P> {
 
     private final RewriteSourceFileHolder<Xml.Document> pom;
 
@@ -57,7 +56,9 @@ private List<Result> executeRecipe(Recipe recipe) {
 
     private void processResults(List<Result> results) {
         if (!results.isEmpty()) {
-            results.forEach(c -> processResult(c));
+			// FIXME: Works only on a single POM and does not apply to all other resources
+			pom.replaceWith((Xml.Document) results.get(0).getAfter());
+           // results.forEach(c -> processResult(c));
         }
     }