No rewrite-gradle

Author: BoykoAlex

headless-services/commons/commons-rewrite/pom.xml

@@ -36,14 +36,6 @@
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-maven</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.openrewrite</groupId>
-			<artifactId>rewrite-groovy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.openrewrite</groupId>
-			<artifactId>rewrite-gradle</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.openrewrite</groupId>
 			<artifactId>rewrite-yaml</artifactId>
@@ -72,15 +64,6 @@
 			<artifactId>rewrite-java-25</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-        <dependency>
-            <groupId>org.openrewrite.gradle.tooling</groupId>
-            <artifactId>model</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-tooling-api</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>

headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParser.java

@@ -51,7 +51,6 @@
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.commons.protocol.java.ProjectBuild;
 import org.springframework.ide.vscode.commons.rewrite.ORDocUtils;
-import org.springframework.ide.vscode.commons.rewrite.gradle.GradleIJavaProjectParser;
 import org.springframework.ide.vscode.commons.rewrite.java.ProjectParser;
 import org.springframework.ide.vscode.commons.rewrite.maven.MavenIJavaProjectParser;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
@@ -239,8 +238,6 @@ private static ProjectParser createRewriteProjectParser(IJavaProject jp, Functio
     	case ProjectBuild.MAVEN_PROJECT_TYPE:
             MavenParser.Builder mavenParserBuilder = MavenParser.builder();
     		return new MavenIJavaProjectParser(jp, JavaParser.fromJavaVersion(), inputProvider, mavenParserBuilder);
-    	case ProjectBuild.GRADLE_PROJECT_TYPE:
-    		return new GradleIJavaProjectParser(jp, JavaParser.fromJavaVersion(), inputProvider);
     	default:
     		throw new IllegalStateException("The project is neither Maven nor Gradle!");
     	}

headless-services/commons/commons-rewrite/src/test/java/org/springframework/ide/vscode/commons/rewrite/gradle/GradleIJavaProjectParserTest.java

@@ -17,13 +17,13 @@
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.openrewrite.Recipe;
 import org.openrewrite.config.DeclarativeRecipe;
-import org.openrewrite.gradle.plugins.UpgradePluginVersion;
 import org.openrewrite.maven.UpgradeParentVersion;
 import org.springframework.ide.vscode.commons.Version;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
+import org.springframework.ide.vscode.commons.protocol.java.ProjectBuild;
 import org.springframework.ide.vscode.commons.util.Assert;
 
 import com.google.gson.JsonElement;
@@ -43,6 +43,8 @@ public SpringBootUpgrade(SimpleLanguageServer server, RewriteRecipeRepository re
 			IJavaProject project = projectFinder.find(new TextDocumentIdentifier(uri)).orElse(null);
 			Assert.isLegal(project != null, "No Spring Boot project found for uri: " + uri);
 
+			Assert.isLegal(project.getProjectBuild().getType() == ProjectBuild.MAVEN_PROJECT_TYPE, "Only Maven projects supported");
+			
 			Version version = SpringProjectUtil.getDependencyVersion(project, SpringProjectUtil.SPRING_BOOT);
 
 			// Version upgrade is not supposed to work for patch version. Only for the major and minor versions.
@@ -69,8 +71,6 @@ private Recipe createUpgradeRecipe(Version version, Version targetVersion) {
 			// patch version upgrade - treat as pom versions only upgrade
 			recipe.getRecipeList().add(new org.openrewrite.maven.UpgradeDependencyVersion("org.springframework.boot", "*", version.getMajor() + "." + version.getMinor() + ".x", null, null, null));
 			recipe.getRecipeList().add(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null, null));
-			recipe.getRecipeList().add(new org.openrewrite.gradle.UpgradeDependencyVersion("org.springframework.boot", "*", version.getMajor() + "." + version.getMinor() + ".x", null));
-			recipe.getRecipeList().add(new UpgradePluginVersion("org.springframework.boot", version.getMajor() + "." + version.getMinor() + ".x", null));
 		}
 
 		if (recipe.getRecipeList().isEmpty()) {

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRecipeRepository.java

@@ -28,6 +28,7 @@
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.java.SpringProjectUtil;
 import org.springframework.ide.vscode.commons.languageserver.reconcile.DiagnosticSeverityProvider;
+import org.springframework.ide.vscode.commons.protocol.java.ProjectBuild;
 
 import com.google.common.collect.ImmutableList;
 
@@ -67,19 +68,21 @@ private Optional<Diagnostic> validateMajorVersion(IJavaProject javaProject, Vers
 
 			List<CodeAction> actions = new ArrayList<>(2);
 
-			bootUpgradeOpt.flatMap(bu -> bu.getNearestAvailableMinorVersion(latest)).map(targetVersion -> {
-				Version upgradeVersion = Version.parse(targetVersion);
-				if (javaProjectVersion.compareTo(upgradeVersion) >= 0) {
-					return null;
-				}
-				CodeAction c = new CodeAction();
-				c.setKind(CodeActionKind.QuickFix);
-				c.setTitle("Upgrade to Spring Boot " + targetVersion + " (executes the full project conversion recipe from OpenRewrite)");
-				String commandId = SpringBootUpgrade.CMD_UPGRADE_SPRING_BOOT;
-				c.setCommand(new Command("Upgrade to Version " + targetVersion, commandId,
-						ImmutableList.of(javaProject.getLocationUri().toASCIIString(), targetVersion, true)));
-				return c;
-			}).ifPresent(actions::add);
+			if (javaProject.getProjectBuild().getType() == ProjectBuild.MAVEN_PROJECT_TYPE) {
+				bootUpgradeOpt.flatMap(bu -> bu.getNearestAvailableMinorVersion(latest)).map(targetVersion -> {
+					Version upgradeVersion = Version.parse(targetVersion);
+					if (javaProjectVersion.compareTo(upgradeVersion) >= 0) {
+						return null;
+					}
+					CodeAction c = new CodeAction();
+					c.setKind(CodeActionKind.QuickFix);
+					c.setTitle("Upgrade to Spring Boot " + targetVersion + " (executes the full project conversion recipe from OpenRewrite)");
+					String commandId = SpringBootUpgrade.CMD_UPGRADE_SPRING_BOOT;
+					c.setCommand(new Command("Upgrade to Version " + targetVersion, commandId,
+							ImmutableList.of(javaProject.getLocationUri().toASCIIString(), targetVersion, true)));
+					return c;
+				}).ifPresent(actions::add);
+			}
 
 			actions.add(openReleaseNotesCodeAction(latest));