Skip to content

Commit ee34627

Browse files
committed
Replace shrinkwrap with OpenRewrite
1 parent 9d8b5a0 commit ee34627

File tree

2 files changed

+48
-34
lines changed

2 files changed

+48
-34
lines changed

components/sbm-openrewrite/pom.xml

+21-21
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,27 @@
7474
<groupId>org.projectlombok</groupId>
7575
<artifactId>lombok</artifactId>
7676
</dependency>
77-
<dependency>
78-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
79-
<artifactId>shrinkwrap-resolver-spi</artifactId>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
83-
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
84-
</dependency>
85-
<dependency>
86-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
87-
<artifactId>shrinkwrap-resolver-spi-maven</artifactId>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
91-
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.jboss.shrinkwrap.resolver</groupId>
95-
<artifactId>shrinkwrap-resolver-bom</artifactId>
96-
<type>pom</type>
97-
</dependency>
77+
<!-- <dependency>-->
78+
<!-- <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
79+
<!-- <artifactId>shrinkwrap-resolver-spi</artifactId>-->
80+
<!-- </dependency>-->
81+
<!-- <dependency>-->
82+
<!-- <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
83+
<!-- <artifactId>shrinkwrap-resolver-api-maven</artifactId>-->
84+
<!-- </dependency>-->
85+
<!-- <dependency>-->
86+
<!-- <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
87+
<!-- <artifactId>shrinkwrap-resolver-spi-maven</artifactId>-->
88+
<!-- </dependency>-->
89+
<!-- <dependency>-->
90+
<!-- <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
91+
<!-- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>-->
92+
<!-- </dependency>-->
93+
<!-- <dependency>-->
94+
<!-- <groupId>org.jboss.shrinkwrap.resolver</groupId>-->
95+
<!-- <artifactId>shrinkwrap-resolver-bom</artifactId>-->
96+
<!-- <type>pom</type>-->
97+
<!-- </dependency>-->
9898

9999
<!-- FIXME: OR8.1 ClassNotFoundException: org.eclipse.aether.spi.synccontext.SyncContextFactory -->
100100
<dependency>

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

+27-13
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@
1515
*/
1616
package org.springframework.sbm.java;
1717

18-
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
18+
import org.assertj.core.api.Assertions;
1919
import org.openrewrite.*;
2020
import org.openrewrite.internal.InMemoryLargeSourceSet;
21-
import org.springframework.sbm.java.util.JavaSourceUtil;
22-
import org.springframework.sbm.testhelper.common.utils.TestDiff;
23-
import org.assertj.core.api.Assertions;
2421
import org.openrewrite.java.JavaIsoVisitor;
2522
import org.openrewrite.java.JavaParser;
2623
import org.openrewrite.java.JavaVisitor;
2724
import org.openrewrite.java.tree.J;
25+
import org.openrewrite.maven.cache.LocalMavenArtifactCache;
26+
import org.openrewrite.maven.tree.ResolvedDependency;
27+
import org.openrewrite.maven.tree.ResolvedGroupArtifactVersion;
28+
import org.openrewrite.maven.utilities.MavenArtifactDownloader;
29+
import org.springframework.sbm.java.util.JavaSourceUtil;
30+
import org.springframework.sbm.testhelper.common.utils.TestDiff;
2831

2932
import java.io.File;
3033
import java.nio.file.Path;
@@ -36,7 +39,7 @@
3639
import java.util.stream.Collectors;
3740
import java.util.stream.Stream;
3841

39-
import static org.junit.jupiter.api.Assertions.fail;
42+
import static org.junit.jupiter.api.AssertionsKt.fail;
4043

4144

4245
public class OpenRewriteTestSupport {
@@ -235,16 +238,27 @@ public static JavaParser.Builder getJavaParser(String... classpath) {
235238
}
236239

237240
/**
238-
* Retrieve the <code>Path</code>s of jars for given classpath
241+
* Retrieve the <code>Path</code>s of jars for given gav
239242
*
240-
* @param classpath in 'groupId:artifactId:version' format
243+
* @param gav in 'groupId:artifactId:version' format
241244
*/
242-
public static List<Path> getClasspathFiles(String... classpath) {
243-
if (classpath.length == 0) return List.of();
244-
File[] as = Maven.resolver().resolve(classpath).withTransitivity().as(File.class);
245-
return Arrays.stream(as)
246-
.map(File::toPath)
247-
.collect(Collectors.toList());
245+
public static List<Path> getClasspathFiles(String... gav) {
246+
if (gav.length == 0) return List.of();
247+
Path localM2 = Path.of(System.getProperty("user.home")).resolve(".m2/repository").normalize().toAbsolutePath();
248+
MavenArtifactDownloader mavenArtifactDownloader = new MavenArtifactDownloader(new LocalMavenArtifactCache(localM2), null, t -> {
249+
throw new RuntimeException(t);
250+
});
251+
return Arrays.stream(gav)
252+
.map(g -> g.split(":"))
253+
.map(g -> new ResolvedGroupArtifactVersion(null, g[0], g[1], g.length == 3 ? g[2] : null, null))
254+
.map(g -> ResolvedDependency.builder()
255+
.gav(g)
256+
.build()
257+
)
258+
.map(g -> {
259+
return mavenArtifactDownloader.downloadArtifact(g);
260+
})
261+
.toList();
248262
}
249263

250264
private static <P> RecipeRun refactor(J.CompilationUnit given, JavaVisitor<ExecutionContext> visitor) {

0 commit comments

Comments
 (0)