Back to use shrinkwrap in tests

Author: fabapp2

components/sbm-openrewrite/pom.xml

@@ -74,27 +74,14 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
-<!--            <artifactId>shrinkwrap-resolver-spi</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
-<!--            <artifactId>shrinkwrap-resolver-api-maven</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
-<!--            <artifactId>shrinkwrap-resolver-spi-maven</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
-<!--            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
-<!--            <artifactId>shrinkwrap-resolver-bom</artifactId>-->
-<!--            <type>pom</type>-->
-<!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-depchain</artifactId>
+            <version>${shrinkwrap.resolvers.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
 
         <!-- FIXME: OR8.1 ClassNotFoundException: org.eclipse.aether.spi.synccontext.SyncContextFactory -->
         <dependency>

components/sbm-openrewrite/src/test/java/org/springframework/sbm/java/OpenRewriteTestSupport.java

@@ -15,19 +15,16 @@
  */
 package org.springframework.sbm.java;
 
-import org.assertj.core.api.Assertions;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.openrewrite.*;
 import org.openrewrite.internal.InMemoryLargeSourceSet;
+import org.springframework.sbm.java.util.JavaSourceUtil;
+import org.springframework.sbm.testhelper.common.utils.TestDiff;
+import org.assertj.core.api.Assertions;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaVisitor;
 import org.openrewrite.java.tree.J;
-import org.openrewrite.maven.cache.LocalMavenArtifactCache;
-import org.openrewrite.maven.tree.ResolvedDependency;
-import org.openrewrite.maven.tree.ResolvedGroupArtifactVersion;
-import org.openrewrite.maven.utilities.MavenArtifactDownloader;
-import org.springframework.sbm.java.util.JavaSourceUtil;
-import org.springframework.sbm.testhelper.common.utils.TestDiff;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -39,7 +36,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.junit.jupiter.api.AssertionsKt.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
 public class OpenRewriteTestSupport {
@@ -238,27 +235,16 @@ public static JavaParser.Builder getJavaParser(String... classpath) {
     }
 
     /**
-     * Retrieve the <code>Path</code>s of jars for given gav
+     * Retrieve the <code>Path</code>s of jars for given classpath
      *
-     * @param gav in 'groupId:artifactId:version' format
+     * @param classpath in 'groupId:artifactId:version' format
      */
-    public static List<Path> getClasspathFiles(String... gav) {
-        if (gav.length == 0) return List.of();
-        Path localM2 = Path.of(System.getProperty("user.home")).resolve(".m2/repository").normalize().toAbsolutePath();
-        MavenArtifactDownloader mavenArtifactDownloader = new MavenArtifactDownloader(new LocalMavenArtifactCache(localM2), null, t -> {
-            throw new RuntimeException(t);
-        });
-        return Arrays.stream(gav)
-                .map(g -> g.split(":"))
-                .map(g -> new ResolvedGroupArtifactVersion(null, g[0], g[1], g.length == 3 ? g[2] : null, null))
-                .map(g -> ResolvedDependency.builder()
-                        .gav(g)
-                        .build()
-                )
-                .map(g -> {
-                    return mavenArtifactDownloader.downloadArtifact(g);
-                })
-                .toList();
+    public static List<Path> getClasspathFiles(String... classpath) {
+        if (classpath.length == 0) return List.of();
+        File[] as = org.jboss.shrinkwrap.resolver.api.maven.Maven.resolver().resolve(classpath).withTransitivity().as(File.class);
+        return Arrays.stream(as)
+                .map(File::toPath)
+                .collect(Collectors.toList());
     }
 
     private static <P> RecipeRun refactor(J.CompilationUnit given, JavaVisitor<ExecutionContext> visitor) {

pom.xml

@@ -219,16 +219,30 @@
                 <version>4.3.4</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>io.spring.asciidoctor.backends</groupId>
+                <artifactId>spring-asciidoctor-backends</artifactId>
+                <version>${spring-asciidoctor-backends.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.junit-pioneer</groupId>
                 <artifactId>junit-pioneer</artifactId>
                 <version>2.0.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>io.spring.asciidoctor.backends</groupId>
-                <artifactId>spring-asciidoctor-backends</artifactId>
-                <version>${spring-asciidoctor-backends.version}</version>
+                <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                <artifactId>shrinkwrap-resolver-bom</artifactId>
+                <version>${shrinkwrap.resolvers.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.shrinkwrap.resolver</groupId>
+                <artifactId>shrinkwrap-resolver-depchain</artifactId>
+                <version>${shrinkwrap.resolvers.version}</version>
+                <scope>test</scope>
+                <type>pom</type>
             </dependency>
         </dependencies>
     </dependencyManagement>