Revamp/954 all tests pass with latest sbm support rewrite

.github/workflows/build-sbm-legacy.yml

@@ -1,8 +1,10 @@
-name: Build
+name: Build SBM Legacy
 on:
   push:
     branches:
       - "**"
+    branches-ignore:
+      - "version/revamp"
     paths-ignore:
       - "sbm-support-rewrite/**"
 jobs:

.github/workflows/build-sbm-revamp.yml

@@ -0,0 +1,62 @@
+name: Build SBM Revamp
+on:
+  push:
+    branches-ignore:
+      - "main"
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: 17
+          cache: 'maven'
+
+      - name: sbm-support-rewrite (build + test)
+        working-directory: sbm-support-rewrite
+        run: mvn --batch-mode clean install
+
+      - name: clean install skipTests
+        run: mvn clean install -DskipTests
+
+      - name: clean
+        run: mvn clean
+
+      - name: spring-boot-migrator (pom)
+        run: mvn --batch-mode install --projects :spring-boot-migrator
+
+      - name: test-helper (build + test)
+        run: mvn --batch-mode install --projects :test-helper
+
+      - name: sbm-openrewrite (build + test)
+        run: mvn --batch-mode install --projects :sbm-openrewrite
+
+      - name: sbm-core (build + test)
+        run: mvn --batch-mode install --projects :sbm-core
+
+      - name: recipe-test-support (build)
+        run: mvn -DskipTests --batch-mode install --projects :recipe-test-support
+
+      - name: sbm-support-boot (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-support-boot
+
+      - name: sbm-support-jee (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-support-jee
+
+      - name: sbm-support-weblogic (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-support-weblogic
+
+      - name: sbm-recipes-jee-to-boot (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-recipes-jee-to-boot
+
+      - name: sbm-recipes-spring-cloud (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-recipes-spring-cloud
+
+      - name: sbm-recipes-boot-upgrade (build)
+        run: mvn -DskipTests --batch-mode install --projects :sbm-recipes-boot-upgrade

.github/workflows/build-sbm-support-rewrite.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Build SBM Support Rewrite
 on:
   push:
     branches:
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 17
@@ -26,30 +26,11 @@ jobs:
       - name: Maven Build
         run: mvn --batch-mode clean package
 
-#      - name: Setup JFrog CLI
-#        uses: jfrog/setup-jfrog-cli@v3
-#        with:
-#          version: 2.46.2
-#        env:
-#          JF_ARTIFACTORY_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-#          MAVEN_REPO_ID: repo.spring.io
-#          MAVEN_REPO_URL: https://repo.spring.io/libs-snapshot-local
-#      # This command adds a new server configuration to the JFrog CLI
-#      - run: |
-#          export SERVER_ID="repo.spring.io"
-#          jf c add $SERVER_ID --url=https://repo.spring.io/libs-snapshot-local --access-token=${{ secrets.JF_ARTIFACTORY_SPRING }} --interactive=false
-#
-#      - name: Deploy to Artifactory
-#        run: |
-#          jfrog mvnc \
-#            --server-id-deploy $SERVER_ID \
-#            --repo-deploy-releases release \
-#            --repo-deploy-snapshots snapshot
-#          echo JFROG_CLI_BUILD_NAME=sbm-support-rewrite >> $GITHUB_ENV
-#          echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
-#      - name: Build and Publish
-#        env:
-#          DISABLE_SAMPLES: true
-#        run: |
-#          jfrog mvn clean install --repo=repo.spring.io
-#          jfrog build-publish
+      - name: Deploy to Artifactory
+        env:
+          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
+          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
+          GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+        run: mvn -B clean deploy -Partifactory,delombok

applications/spring-shell/src/main/java/org/springframework/sbm/shell/ApplyShellCommand.java

@@ -13,22 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * 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.shell;
 
 import lombok.RequiredArgsConstructor;

applications/spring-shell/src/test/resources/testcode/spring-petclinic-1x/src/main/java/org/springframework/samples/petclinic/owner/Owner.java

@@ -26,7 +26,7 @@
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
-import javax.validation.constraints.Digits;
+import jakarta.validation.constraints.Digits;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.support.MutableSortDefinition;

applications/spring-shell/src/test/resources/testcode/spring-petclinic-1x/src/main/java/org/springframework/samples/petclinic/owner/OwnerController.java

@@ -26,7 +26,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Collection;
 import java.util.Map;
 

applications/spring-shell/src/test/resources/testcode/spring-petclinic-1x/src/main/java/org/springframework/samples/petclinic/owner/PetController.java

@@ -23,7 +23,7 @@
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Collection;
 
 /**

applications/spring-shell/src/test/resources/testcode/spring-petclinic-1x/src/main/java/org/springframework/samples/petclinic/owner/VisitController.java

@@ -23,7 +23,7 @@
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.Map;
 
 /**

applications/spring-shell/src/test/resources/testcode/spring-petclinic-1x/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java

@@ -5,8 +5,8 @@
 import java.util.Locale;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import org.junit.Test;
 import org.springframework.context.i18n.LocaleContextHolder;

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

@@ -19,7 +19,6 @@
 import org.openrewrite.maven.UpdateMavenModel;
 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.AnyDeclaredDependencyExistMatchingRegex;
 import org.springframework.sbm.build.migration.recipe.RemoveMavenPlugin;
 import org.springframework.sbm.engine.recipe.Action;

components/openrewrite-spring-recipes/src/test/java/org/springframework/sbm/SpringBoot23To24MigrationTest.java

@@ -27,7 +27,7 @@
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.Recipe;
 import org.springframework.sbm.engine.recipe.UserInteractions;
-import org.springframework.sbm.openrewrite.RewriteExecutionContext;
+import org.springframework.sbm.parsers.RewriteExecutionContext;
 import org.springframework.sbm.project.parser.ProjectContextInitializer;
 import org.springframework.sbm.spring.migration.actions.InitDataSourceAfterJpaInitAction;
 import org.springframework.sbm.test.ProjectContextFileSystemTestSupport;

components/recipe-test-support/pom.xml

@@ -66,6 +66,11 @@
             <type>test-jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.13.0</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -21,7 +21,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.sbm.engine.commands.ScanCommand;
 import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.openrewrite.RewriteExecutionContext;
 import org.springframework.sbm.project.parser.ProjectContextInitializer;
 
 import java.io.IOException;

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.test;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.sbm.engine.commands.ApplicableRecipeListCommand;
 import org.springframework.sbm.engine.commands.ApplyCommand;
 import org.springframework.sbm.engine.commands.ScanCommand;
@@ -26,7 +27,6 @@
 import freemarker.template.Configuration;
 import lombok.AccessLevel;
 import lombok.Setter;
-import org.apache.commons.io.FileUtils;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.test;
 
+import org.springframework.sbm.boot.autoconfigure.ScopeConfiguration;
 import org.springframework.sbm.build.impl.MavenBuildFileRefactoringFactory;
 import org.springframework.sbm.build.impl.MavenSettingsInitializer;
 import org.springframework.sbm.build.impl.RewriteMavenParser;
@@ -29,7 +30,6 @@
 import org.springframework.sbm.project.resource.ResourceHelper;
 import org.springframework.sbm.scopes.ExecutionScope;
 import org.springframework.sbm.scopes.ScanScope;
-import org.springframework.sbm.scopes.ScopeConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -38,7 +38,7 @@
 import org.springframework.stereotype.Component;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
@@ -69,7 +69,7 @@ private RecipeTestSupport() {
             DefaultActionDeserializer.class,
             RewriteJavaSearchActionDeserializer.class,
             RewriteRecipeLoader.class,
-            RewriteMigrationResultMerger.class,
+            MigrationResultProjectContextMerger.class,
             RewriteSourceFileWrapper.class,
             SbmRecipeLoader.class,
             BasePackageCalculator.class,

components/sbm-core/pom.xml

@@ -26,19 +26,21 @@
 
     <artifactId>sbm-core</artifactId>
 
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.sbm</groupId>
             <artifactId>sbm-openrewrite</artifactId>
             <version>0.15.2-SNAPSHOT</version>
         </dependency>
-
         <dependency>
-            <groupId>org.springframework.sbm</groupId>
-            <artifactId>sbm-utils</artifactId>
-            <version>0.15.2-SNAPSHOT</version>
+            <groupId>org.springframework.experimental</groupId>
+            <artifactId>sbm-support-rewrite</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
@@ -61,6 +63,10 @@
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-maven</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-xml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
             <artifactId>rewrite-java</artifactId>
@@ -124,11 +130,11 @@
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.el</artifactId>
-            <version>3.0.3</version>
+            <version>5.0.0-M1</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -167,13 +173,18 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-		<dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.13.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 			<version>2.14.1</version>
 		</dependency>
-
-	</dependencies>
+    </dependencies>
     <build>
         <plugins>
             <plugin>