spring-projects-experimental · fabapp2 · Jul 15, 2022 · Jul 14, 2022 · Jul 14, 2022 · Jul 14, 2022
diff --git a/.github/workflows/mvn-build.yml b/.github/workflows/mvn-build.yml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
       - name: Build with Maven

diff --git a/applications/rest-service/pom.xml b/applications/rest-service/pom.xml
@@ -64,28 +64,6 @@
             <artifactId>sbm-support-weblogic</artifactId>
             <version>0.11.2-SNAPSHOT</version>
         </dependency>
-
-        <!-- Override Jackson coming from spring boot -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.sbm</groupId>
             <artifactId>openrewrite-spring-recipes</artifactId>
@@ -94,12 +72,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions> <!-- This is what you need to add -->
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-dataformat-yaml</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/applications/spring-shell/pom.xml b/applications/spring-shell/pom.xml
@@ -66,12 +66,6 @@
         <dependency>
             <groupId>org.springframework.shell</groupId>
             <artifactId>spring-shell-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>net.java.dev.jna</groupId>
-                    <artifactId>jna</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -109,32 +103,6 @@
             </exclusions>
         </dependency>
 
-        <!-- Override Jackson coming from spring boot -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.sbm</groupId>
             <artifactId>openrewrite-spring-recipes</artifactId>

diff --git a/applications/spring-shell/src/main/java/org/springframework/sbm/shell/ApplyShellCommand.java b/applications/spring-shell/src/main/java/org/springframework/sbm/shell/ApplyShellCommand.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2021 - 2022 the original author or authors.
  *

diff --git a/...ications/spring-shell/src/test/java/org/springframework/sbm/IntegrationTestBaseClass.java b/...ications/spring-shell/src/test/java/org/springframework/sbm/IntegrationTestBaseClass.java
@@ -35,8 +35,6 @@
 import org.springframework.sbm.project.resource.ResourceHelper;
 import org.springframework.sbm.shell.ApplyShellCommand;
 import org.springframework.sbm.shell.ScanShellCommand;
-import org.springframework.shell.jline.InteractiveShellApplicationRunner;
-import org.springframework.shell.jline.ScriptShellApplicationRunner;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.util.SocketUtils;
 import org.testcontainers.containers.GenericContainer;
@@ -61,6 +59,7 @@
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
 
 /**
  * Base class to be extended by integrationTests.
@@ -74,8 +73,11 @@
  * See also: {@link #intializeTestProject()}, {@link #writeFile} and
  * {@link #writeJavaFile(String)}
  */
-@SpringBootTest(properties = {InteractiveShellApplicationRunner.SPRING_SHELL_INTERACTIVE_ENABLED + "=false",
-        ScriptShellApplicationRunner.SPRING_SHELL_SCRIPT_ENABLED + "=false", "sbm.gitSupportEnabled=false"})
+@SpringBootTest(properties = {
+        "spring.shell.interactive.enabled=false",
+        "spring.shell.script.enabled=false",
+        "sbm.gitSupportEnabled=false"
+})
 @DirtiesContext // paralel runs
 public abstract class IntegrationTestBaseClass {
 
@@ -216,6 +218,7 @@ protected void scanProject() {
     protected void executeMavenGoals(Path executionDir, String... goals) {
         Invoker invoker = new DefaultInvoker();
         InvocationRequest request = new DefaultInvocationRequest();
+        request.setErrorHandler(new SystemOutHandler());
         request.setInputStream(InputStream.nullInputStream());
         File pomXml = executionDir.resolve("pom.xml").toFile();
         request.setPomFile(pomXml);
@@ -226,18 +229,20 @@ protected void executeMavenGoals(Path executionDir, String... goals) {
                 CommandLineException executionException = invocationResult.getExecutionException();
                 int exitCode = invocationResult.getExitCode();
                 if (executionException != null) {
-                    Assert.fail("Maven build 'mvn " + Arrays.asList(goals).stream().collect(Collectors.joining(" "))
+                    Assert.fail("Maven build 'mvn " + g
+                            + " " + pomXml + " "
                             + "' failed with Exception: " + executionException.getMessage());
                 }
-                if (exitCode == 1) {
-                    Assert.fail("Maven build 'mvn " + Arrays.asList(goals).stream().collect(Collectors.joining(" "))
+                if (exitCode != 0) {
+                    Assert.fail("Maven build 'mvn " + g
                             + "' failed with exitCode: " + exitCode);
                 }
             } catch (MavenInvocationException e) {
-                Assert.fail("Maven build 'mvn " + Arrays.asList(goals).stream().collect(Collectors.joining(" "))
+                Assert.fail("Maven build 'mvn " + g
+                        + " " + pomXml + " "
                         + "' failed with Exception: " + e.getMessage());
                 e.printStackTrace();
-                throw new RuntimeException(e);
+                fail("Maven build 'mvn " + g + "' failed");
             }
         });
     }

diff --git a/...sources/testcode/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java b/...sources/testcode/jpa-hibernate/src/test/java/org/superbiz/injection/h3jpa/MoviesTest.java
diff --git a/components/openrewrite-spring-recipes/pom.xml b/components/openrewrite-spring-recipes/pom.xml
@@ -71,32 +71,5 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- Override Jackson coming from spring boot -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/components/sbm-core/pom.xml b/components/sbm-core/pom.xml
@@ -26,11 +26,6 @@
 
     <artifactId>sbm-core</artifactId>
 
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.sbm</groupId>

diff --git a/...c/main/java/org/springframework/sbm/engine/precondition/JavaVersionPreconditionCheck.java b/...c/main/java/org/springframework/sbm/engine/precondition/JavaVersionPreconditionCheck.java
@@ -26,8 +26,8 @@ class JavaVersionPreconditionCheck extends PreconditionCheck {
     @Override
     public PreconditionCheckResult verify(Path projectRoot, List<Resource> projectResources) {
         String javaVersion = System.getProperty("java.specification.version");
-        if(! "11".equals(javaVersion)) {
-            return new PreconditionCheckResult(ResultState.WARN, String.format("Java 11 is required. Check found Java %s.", javaVersion));
+        if(! ("11".equals(javaVersion) || "17".equals(javaVersion))) {
+            return new PreconditionCheckResult(ResultState.WARN, String.format("Java 11 or 17 is required. Check found Java %s.", javaVersion));
         }
         return new PreconditionCheckResult(ResultState.PASSED, String.format("Required Java version (%s) was found.", javaVersion));
     }

diff --git a/...st/java/org/springframework/sbm/engine/precondition/JavaVersionPreconditionCheckTest.java b/...st/java/org/springframework/sbm/engine/precondition/JavaVersionPreconditionCheckTest.java
@@ -35,11 +35,11 @@ void unsupportedJavaVersionShouldTriggerWarning() {
 
         PreconditionCheckResult checkResult = sut.verify(projectRoot, resources);
         assertThat(checkResult.getState()).isEqualTo(PreconditionCheck.ResultState.WARN);
-        assertThat(checkResult.getMessage()).isEqualTo("Java 11 is required. Check found Java 10.");
+        assertThat(checkResult.getMessage()).isEqualTo("Java 11 or 17 is required. Check found Java 10.");
     }
 
     @Test
-    void supportedJavaVersionShouldPass() {
+    void supportedJavaVersionShouldPassWithJava11() {
         JavaVersionPreconditionCheck sut = new JavaVersionPreconditionCheck();
         Path projectRoot = Path.of("./test-dummy").toAbsolutePath().normalize();
         List<Resource> resources = List.of();
@@ -51,4 +51,17 @@ void supportedJavaVersionShouldPass() {
         assertThat(checkResult.getMessage()).isEqualTo("Required Java version (11) was found.");
     }
 
+    @Test
+    void supportedJavaVersionShouldPassWithJava17() {
+        JavaVersionPreconditionCheck sut = new JavaVersionPreconditionCheck();
+        Path projectRoot = Path.of("./test-dummy").toAbsolutePath().normalize();
+        List<Resource> resources = List.of();
+
+        System.setProperty("java.specification.version", "17");
+
+        PreconditionCheckResult checkResult = sut.verify(projectRoot, resources);
+        assertThat(checkResult.getState()).isEqualTo(PreconditionCheck.ResultState.PASSED);
+        assertThat(checkResult.getMessage()).isEqualTo("Required Java version (17) was found.");
+    }
+
 }
diff --git a/...java/org/springframework/sbm/engine/precondition/PreconditionVerifierIntegrationTest.java b/...java/org/springframework/sbm/engine/precondition/PreconditionVerifierIntegrationTest.java
@@ -87,7 +87,7 @@ void allChecksFailed() {
         assertThat(preconditionVerificationResult.getResults().get(2).getState()).isEqualTo(PreconditionCheck.ResultState.FAILED);
         assertThat(preconditionVerificationResult.getResults().get(2).getMessage()).isEqualTo("PreconditionCheck check could not find a 'src/main/java' dir. This dir is required.");
         assertThat(preconditionVerificationResult.getResults().get(3).getState()).isEqualTo(PreconditionCheck.ResultState.WARN);
-        assertThat(preconditionVerificationResult.getResults().get(3).getMessage()).isEqualTo("Java 11 is required. Check found Java 9.");
+        assertThat(preconditionVerificationResult.getResults().get(3).getMessage()).isEqualTo("Java 11 or 17 is required. Check found Java 9.");
     }
 
     @Test

diff --git a/...nents/sbm-core/src/test/java/org/springframework/sbm/java/impl/OpenRewriteMethodTest.java b/...nents/sbm-core/src/test/java/org/springframework/sbm/java/impl/OpenRewriteMethodTest.java
@@ -142,7 +142,6 @@ void testRemoveAnnotation() {
     }
 
     @Test
-    @Disabled("FIXME: https://github.com/spring-projects-experimental/spring-boot-migrator/issues/200")
     void removeMethodAnnotationsFromDependency() {
         String given =
                 "import javax.ejb.*;\n" +

diff --git a/...src/test/java/org/springframework/sbm/project/parser/JavaProvenanceMarkerFactoryTest.java b/...src/test/java/org/springframework/sbm/project/parser/JavaProvenanceMarkerFactoryTest.java
@@ -47,7 +47,7 @@ void test() {
                 "    <modelVersion>4.0.0</modelVersion>\n" +
                 "    <name>project-name</name>" +
                 "    <properties>\n" +
-                "        <maven.compiler.source>11</maven.compiler.source>\n" +
+                "        <maven.compiler.source>17</maven.compiler.source>\n" +
                 "        <maven.compiler.target>11</maven.compiler.target>\n" +
                 "    </properties>\n" +
                 "\n" +
@@ -70,7 +70,10 @@ void test() {
         assertThat(javaProvenanceMarkers).hasSize(3);
 
         Marker javaVersionMarker = extractMarker(javaProvenanceMarkers, JavaVersion.class);
-        ResourceVerifierTestHelper.javaVersionMarker(11, "11", "11").assertMarker(maven, javaVersionMarker);
+
+        String property = System.getProperty("java.version");
+        int javaVersion = Integer.valueOf(property.contains(".") ? property.substring(0, property.indexOf(".")) : property);
+        ResourceVerifierTestHelper.javaVersionMarker(javaVersion, "17", "11").assertMarker(maven, javaVersionMarker);
 
         Marker buildToolMarker = extractMarker(javaProvenanceMarkers, BuildTool.class);
         ResourceVerifierTestHelper.buildToolMarker("Maven", "3.6").assertMarker(maven, buildToolMarker);

diff --git a/...e/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java b/...e/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.sbm.project.parser;
 
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/components/sbm-core/testcode/path-scanner/pom.xml b/components/sbm-core/testcode/path-scanner/pom.xml
@@ -25,7 +25,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 

diff --git a/components/sbm-openrewrite/pom.xml b/components/sbm-openrewrite/pom.xml
@@ -100,12 +100,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.tngtech.archunit</groupId>
-            <artifactId>archunit</artifactId>
-            <version>0.21.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/...ts/sbm-openrewrite/src/test/java/org/springframework/sbm/java/OpenRewriteTestSupport.java b/...ts/sbm-openrewrite/src/test/java/org/springframework/sbm/java/OpenRewriteTestSupport.java
@@ -15,10 +15,10 @@
  */
 package org.springframework.sbm.java;
 
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.springframework.sbm.java.util.JavaSourceUtil;
 import org.springframework.sbm.testhelper.common.utils.TestDiff;
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.Result;
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     /*
      * Copyright 2021 - 2022 the original author or authors.
      *
@@ Expand Down @@