Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2.7 gson for jdt ls ext. Boot upgrade recipes from minor version + 1.

Browse Source
This commit is contained in:
aboyko
2023-01-31 15:12:06 -05:00
parent f4cfeb82bf
commit 57fe92a575
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
View File

@@ -23,9 +23,9 @@ Export-Package: org.springframework.ide.vscode.commons.protocol,
org.springframework.tooling.jdt.ls.commons.java,
org.springframework.tooling.jdt.ls.commons.javadoc,
org.springframework.tooling.jdt.ls.commons.resources
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Import-Package: com.google.gson;version="2.7.0",
com.google.gson.annotations;version="2.7.0",
com.google.gson.reflect;version="2.7.0",
com.google.gson.stream;version="2.7.0"
Bundle-ClassPath: .,
lib/commons-lsp-extensions.jar

8
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
View File

@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.jdt.ls.core,
com.google.guava,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Import-Package: com.google.gson;version="2.7.0",
com.google.gson.annotations;version="2.7.0",
com.google.gson.reflect;version="2.7.0",
com.google.gson.stream;version="2.7.0"

2
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/SpringBootUpgrade.java
View File

@@ -105,7 +105,7 @@ public class SpringBootUpgrade {
recipe.doNext(new UpgradeDependencyVersion("org.springframework.boot", "*", version.getMajor() + "." + version.getMinor() + ".x", null, null, null));
recipe.doNext(new UpgradeParentVersion("org.springframework.boot", "spring-boot-starter-parent", version.getMajor() + "." + version.getMinor() + ".x", null, null));
} else /*if (version.getMajor() == targetVersion.getMajor())*/ {
List<String> recipedIds = createRecipeIdsChain(version.getMajor(), version.getMinor(), targetVersion.getMajor(), targetVersion.getMinor(), versionsToRecipeId);
List<String> recipedIds = createRecipeIdsChain(version.getMajor(), version.getMinor() + 1, targetVersion.getMajor(), targetVersion.getMinor(), versionsToRecipeId);
if (!recipedIds.isEmpty()) {
String recipeId = recipedIds.get(recipedIds.size() - 1);
// TODO: Review after new rewrite adoption

4
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/validation/test/ProjectGenerationsValidationTest.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020, 2022 Pivotal, Inc.
* Copyright (c) 2020, 2023 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,6 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
@ExtendWith(SpringExtension.class)
@BootLanguageServerTest
@Import(HoverTestConf.class)
@Disabled
public class ProjectGenerationsValidationTest {
@Autowired private BootLanguageServerHarness harness;