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

Upgrade dependencies and a bit of cleanup

Browse Source
This commit is contained in:
aboyko
2023-11-02 12:34:31 -04:00
parent c30c2a6a37
commit e281e0f6ad
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless-services/commons/commons-rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
View File

@@ -22,6 +22,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -56,8 +57,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocu
import org.springframework.ide.vscode.commons.util.ExceptionUtil;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import javolution.util.function.Supplier;
public class ORAstUtils {
private static final Logger log = LoggerFactory.getLogger(ORAstUtils.class);

6
headless-services/commons/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.1.4</version>
<version>3.1.5</version>
<relativePath></relativePath>
</parent>
@@ -113,8 +113,8 @@
<commons-codec-version>1.13</commons-codec-version>
<!-- Rewrite specific properties -->
<rewrite-version>8.5.1</rewrite-version>
<rewrite-spring-version>5.0.11</rewrite-spring-version>
<rewrite-version>8.9.0-SNAPSHOT</rewrite-version>
<rewrite-spring-version>5.1.0-SNAPSHOT</rewrite-spring-version>
<rewrite-gradle-tooling-api-version>1.3.2</rewrite-gradle-tooling-api-version>
<gradle-tooling.version>8.3</gradle-tooling.version>

5
headless-services/spring-boot-language-server/pom.xml
View File

@@ -61,11 +61,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-yaml</artifactId>

4
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/modulith/ModulithService.java
View File

@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,7 +57,6 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.tngtech.archunit.thirdparty.com.google.common.base.Objects;
public class ModulithService {
@@ -182,7 +182,7 @@ public class ModulithService {
private boolean updateAppModulesCache(IJavaProject project, AppModules modules) {
URI uri = project.getLocationUri();
AppModules oldModules = modules == null ? cache.remove(uri) : cache.put(uri, modules);
if (!Objects.equal(modules, oldModules)) {
if (!Objects.equals(modules, oldModules)) {
validate(project);
return true;
}