From f0c5f8062e8ced221890ea21524c5e45145d5204 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 22 Dec 2023 16:14:22 -0500 Subject: [PATCH] Adjustments after adoption in STS --- .../rewrite/gradle/model/SpringRewriteModelBuilder.java | 4 ++-- .../resources/{init.gradle => init-spring-rewrite.gradle} | 0 spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/{init.gradle => init-spring-rewrite.gradle} (100%) diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java b/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java index 969e8d4..445ab2c 100644 --- a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java +++ b/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/java/org/springframework/rewrite/gradle/model/SpringRewriteModelBuilder.java @@ -47,11 +47,11 @@ public class SpringRewriteModelBuilder { arguments.add(buildFile.getAbsolutePath()); } arguments.add("--init-script"); - Path init = projectDir.toPath().resolve("openrewrite-tooling.gradle").toAbsolutePath(); + Path init = projectDir.toPath().resolve("spring-openrewrite-tooling.gradle").toAbsolutePath(); arguments.add(init.toString()); try (ProjectConnection connection = connector.connect()) { ModelBuilder customModelBuilder = connection.model(type); - try (InputStream is = SpringRewriteModelBuilder.class.getResourceAsStream("/init.gradle")) { + try (InputStream is = SpringRewriteModelBuilder.class.getResourceAsStream("/init-spring-rewrite.gradle")) { if (is == null) { throw new IllegalStateException("Expected to find init.gradle on the classpath"); } diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init.gradle b/spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle similarity index 100% rename from spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init.gradle rename to spring-rewrite-commons-gradle/rewrite-gradle-model/src/main/resources/init-spring-rewrite.gradle diff --git a/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml b/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml index d952160..947122a 100644 --- a/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml +++ b/spring-rewrite-commons-gradle/rewrite-gradle-parser/pom.xml @@ -29,6 +29,7 @@ dev.gradleplugins gradle-api ${gradle.version} + provided org.openrewrite