Upgrade dependencies and a bit of cleanup

spring-projects · Nov 2, 2023 · e281e0f · e281e0f
1 parent c30c2a6
commit e281e0f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/...rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java b/...rewrite/src/main/java/org/springframework/ide/vscode/commons/rewrite/java/ORAstUtils.java
@@ -22,6 +22,7 @@
 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.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);

diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
@@ -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>

diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
@@ -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>

diff --git a/...ge-server/src/main/java/org/springframework/ide/vscode/boot/modulith/ModulithService.java b/...ge-server/src/main/java/org/springframework/ide/vscode/boot/modulith/ModulithService.java
@@ -23,6 +23,7 @@
 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.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 @@ CompletableFuture<Boolean> requestMetadata(IJavaProject p) {
  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;
  }