Skip to content

Commit 16a5dfc

Browse files
timtebeekTim te Beek
andauthored
Fix Kotlin test failures after K2 compiler upgrade (#940)
Remove .+ version suffixes from KotlinParser.classpathFromResources() calls so the K2 compiler's version stripping regex (-\d+$) can properly resolve JAR files. Affects 4 test files with Kotlin parser configuration. Co-authored-by: Tim te Beek <tim@mac.home>
1 parent aa8d770 commit 16a5dfc

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/test/java/org/openrewrite/java/spring/ImplicitWebAnnotationNamesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ImplicitWebAnnotationNamesTest implements RewriteTest {
3737
public void defaults(RecipeSpec spec) {
3838
spec.recipe(new ImplicitWebAnnotationNames())
3939
.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "spring-web-5.+"))
40-
.parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "spring-web-5.+"));
40+
.parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "spring-web-5"));
4141
}
4242

4343
@DocumentExample

src/test/java/org/openrewrite/java/spring/NoAutowiredOnConstructorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class NoAutowiredOnConstructorTest implements RewriteTest {
3434
public void defaults(RecipeSpec spec) {
3535
spec.recipe(new NoAutowiredOnConstructor())
3636
.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "spring-beans-5.+", "spring-boot-1.5.+", "spring-context-5.+", "spring-core-5.+"))
37-
.parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "spring-beans-5.+", "spring-boot-1.5.+", "spring-context-5.+", "spring-core-5.+"));
37+
.parser(KotlinParser.builder().classpathFromResources(new InMemoryExecutionContext(), "spring-beans-5", "spring-boot-1.5", "spring-context-5", "spring-core-5"));
3838
}
3939

4040
@Issue("https://github.com/openrewrite/rewrite-spring/issues/78")

src/test/java/org/openrewrite/java/spring/boot2/DatabaseComponentAndBeanInitializationOrderingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class DatabaseComponentAndBeanInitializationOrderingTest implements RewriteTest
5252
"jooq-3.14.15", "jakarta.persistence-api-2.2.3");
5353
private final KotlinParser.Builder KOTLIN_PARSER = KotlinParser.builder()
5454
.classpathFromResources(new InMemoryExecutionContext(),
55-
"spring-beans-5.+", "spring-context-5.+", "spring-boot-2.4", "spring-jdbc-4.1.+", "spring-orm-5.3.+",
55+
"spring-beans-5", "spring-context-5", "spring-boot-2.4", "spring-jdbc-4.1", "spring-orm-5.3",
5656
"jooq-3.14.15", "jakarta.persistence-api-2.2.3");
5757

5858
@Override

src/test/java/org/openrewrite/java/spring/http/SimplifyWebTestClientCallsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void defaults(RecipeSpec spec) {
3737
.parser(JavaParser.fromJavaVersion()
3838
.classpathFromResources(new InMemoryExecutionContext(), "spring-web-6.+", "spring-test-6.+"))
3939
.parser(KotlinParser.builder()
40-
.classpathFromResources(new InMemoryExecutionContext(), "spring-web-6.+", "spring-test-6.+"));
40+
.classpathFromResources(new InMemoryExecutionContext(), "spring-web-6", "spring-test-6"));
4141
}
4242

4343
@DocumentExample

0 commit comments

Comments
 (0)