Upgrade Dependencies

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
-	<classpathentry exported="true" kind="lib" path="lib/remark-1.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/remark-1.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.9.2.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF

@@ -34,6 +34,6 @@ Export-Package: org.springframework.tooling.ls.eclipse.commons,
  org.springframework.tooling.ls.eclipse.commons.preferences
 Bundle-Activator: org.springframework.tooling.ls.eclipse.commons.LanguageServerCommonsActivator
 Bundle-ClassPath: .,
- lib/remark-1.0.0.jar,
+ lib/remark-1.2.0.jar,
  lib/jsoup-1.9.2.jar
 Import-Package: com.google.gson;version="2.7.0"

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/build.properties

@@ -4,7 +4,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               lib/remark-1.0.0.jar,\
+               lib/remark-1.2.0.jar,\
                lib/jsoup-1.9.2.jar,\
                about.html,\
                css/

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml

@@ -48,7 +48,7 @@
 						<artifactItem>
 							<groupId>com.kotcrab.remark</groupId>
 							<artifactId>remark</artifactId>
-							<version>1.0.0</version>
+							<version>1.2.0</version>
 						</artifactItem>
 						<artifactItem>
 							<groupId>org.jsoup</groupId>

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

@@ -18,21 +18,31 @@
 			<artifactId>commons-util</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<!-- NOTE: Reactor and reactor-netty versions must match versions used by the CF client -->
 		<dependency>
 			<groupId>org.cloudfoundry</groupId>
 			<artifactId>cloudfoundry-client-reactor</artifactId>
-			<version>${cloudfoundry-client-version}</version>
+			<version>3.8.0.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.cloudfoundry</groupId>
 			<artifactId>cloudfoundry-operations</artifactId>
-			<version>${cloudfoundry-client-version}</version>
+			<version>3.8.0.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-core</artifactId>
+			<version>3.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.projectreactor.ipc</groupId>
+			<artifactId>reactor-netty</artifactId>
+			<version>0.7.15.RELEASE</version>
 		</dependency>
 				<!-- Test harness -->
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito-version}</version>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

headless-services/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/MockCfCli.java

@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.commons.cloudfoundry.client;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

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

@@ -37,8 +37,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito-version}</version>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

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

@@ -24,26 +24,22 @@
 			<version>${project.version}</version>
 		</dependency>		
 		<dependency>
-			<groupId>org.jboss</groupId>
+			<groupId>io.smallrye</groupId>
 			<artifactId>jandex</artifactId>
-			<version>3.1.6</version>
 		</dependency>
 		<!-- HTML <-> Markdown conversion -->
 		<dependency>
 		    <groupId>com.kotcrab.remark</groupId>
 		    <artifactId>remark</artifactId>
-		    <version>1.0.0</version>
 		</dependency>
 		<!-- Reactor -->
 		<dependency>
 		    <groupId>io.projectreactor</groupId>
 		    <artifactId>reactor-core</artifactId>
-		    <version>${reactor-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

headless-services/commons/commons-java/src/test/java/org/springframework/ide/vscode/commons/jandex/JdtLsIndexTest.java

@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.io.File;

headless-services/commons/commons-language-server/pom.xml

@@ -31,7 +31,6 @@
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
-			<version>${reactor-version}</version>
 		</dependency>
 
 		<dependency>

headless-services/commons/commons-lsp-extensions/pom.xml

@@ -15,7 +15,6 @@
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
 			<artifactId>org.eclipse.lsp4j</artifactId>
-			<version>${lsp4j-version}</version>
 		</dependency>
 	</dependencies>
 

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

@@ -91,8 +91,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${mockito-version}</version>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 

headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/MavenProjectCacheTest.java

@@ -15,7 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;

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

@@ -17,13 +17,11 @@
 		<dependency>
 			<groupId>org.eclipse.lsp4j</groupId>
 			<artifactId>org.eclipse.lsp4j</artifactId>
-			<version>${lsp4j-version}</version>
 		</dependency>
 		<!-- Efficient 'text buffer' implementation from: -->
 		<dependency>
 			<groupId>org.javolution</groupId>
 			<artifactId>javolution-core-java</artifactId>
-			<version>6.0.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.osgi</groupId>
@@ -38,12 +36,10 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>${guava-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
-			<version>${reactor-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.bytebuddy</groupId>
@@ -55,7 +51,6 @@
 		<dependency>
 			<groupId>com.kotcrab.remark</groupId>
 			<artifactId>remark</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 	</dependencies>
 

headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MimeTypes.java

@@ -25,7 +25,7 @@ public class MimeTypes {
 
 	public static String[] getKnownMimeTypes() {
 		try {
-			Field f = MediaType.class.getDeclaredField("KNOWN_TYPES");
+			Field f = MediaType.class.getDeclaredField("knownTypes");
 			f.setAccessible(true);
 			@SuppressWarnings("unchecked")
 			Map<MediaType, MediaType> map = (Map<MediaType, MediaType>) f.get(null);

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

@@ -31,7 +31,6 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>${guava-version}</version>
 		</dependency>
 	</dependencies>
 

headless-services/commons/java-properties/generate-parser.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
-ANTLR_VERSION=4.13.1
+ANTLR_VERSION=$(../../mvnw help:evaluate -Dexpression=antlr.version -q -DforceStdout -f ../pom.xml)
+echo "Using ANTLR version: ${ANTLR_VERSION}"
 if [ ! -f antlr-${ANTLR_VERSION}.jar ]; then
     curl https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar --output antlr-${ANTLR_VERSION}.jar
 fi
 workdir=$(pwd)
 cd resources
 java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar JavaProperties.g4 -o ${workdir}/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser -package org.springframework.ide.vscode.java.properties.antlr.parser
-

headless-services/commons/java-properties/pom.xml

@@ -13,22 +13,10 @@
 
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-util</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<!-- Guava collections -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava-version}</version>
-		</dependency>
 		<!-- ANTLR Parser Runtime -->
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>
-			<version>${antlr.version}</version>
 		</dependency>
 	</dependencies>
 

headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java

@@ -36,7 +36,6 @@
 import org.springframework.ide.vscode.java.properties.parser.PropertiesAst;
 import org.springframework.ide.vscode.java.properties.parser.PropertiesFileEscapes;
 
-import com.google.common.collect.ImmutableList;
 
 /**
  * ANTLR based parser implementation
@@ -130,7 +129,7 @@ public void exitEmptyLine(EmptyLineContext ctx) {
 	    parser.parse();
 
 	    // Collect and return parse results
-	    return new ParseResults(new PropertiesAst(ImmutableList.copyOf(astNodes)), ImmutableList.copyOf(syntaxErrors), ImmutableList.copyOf(problems));
+	    return new ParseResults(new PropertiesAst(List.copyOf(astNodes)), List.copyOf(syntaxErrors), List.copyOf(problems));
 	}
 
 	private static Problem createProblem(String message, String code, Token token) {
@@ -253,7 +252,7 @@ public KeyValuePair(PropertyLineContext context, Key key, Value value) {
 			this.context = context;
 			this.key = key;
 			this.value = value;
-			this.children = ImmutableList.of(key, value);
+			this.children = List.of(key, value);
 		}
 
 		protected PropertyLineContext getContext() {

headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from JavaProperties.g4 by ANTLR 4.13.1
+// Generated from JavaProperties.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.java.properties.antlr.parser;
 
 import org.antlr.v4.runtime.ParserRuleContext;

headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java

@@ -1,4 +1,4 @@
-// Generated from JavaProperties.g4 by ANTLR 4.13.1
+// Generated from JavaProperties.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.java.properties.antlr.parser;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -11,7 +11,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
 public class JavaPropertiesLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =

headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java

@@ -1,4 +1,4 @@
-// Generated from JavaProperties.g4 by ANTLR 4.13.1
+// Generated from JavaProperties.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.java.properties.antlr.parser;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 

headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java

@@ -1,4 +1,4 @@
-// Generated from JavaProperties.g4 by ANTLR 4.13.1
+// Generated from JavaProperties.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.java.properties.antlr.parser;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
@@ -9,9 +9,9 @@
 import java.util.Iterator;
 import java.util.ArrayList;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
 public class JavaPropertiesParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =

headless-services/commons/jpql/generate-parsers.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
-ANTLR_VERSION=4.13.1
+ANTLR_VERSION=$(../../mvnw help:evaluate -Dexpression=antlr.version -q -DforceStdout -f ../pom.xml)
+echo "Using ANTLR version: ${ANTLR_VERSION}"
 if [ ! -f antlr-${ANTLR_VERSION}.jar ]; then
     curl https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar --output antlr-${ANTLR_VERSION}.jar
 fi
@@ -13,4 +14,3 @@ java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar SpelLexer.g4 SpelParser.g4 -o ${
 java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar PostgreSqlLexer.g4 PostgreSqlParser.g4 -o ${workdir}/src/main/java/org/springframework/ide/vscode/parser/postgresql -package org.springframework.ide.vscode.parser.postgresql
 java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar CronLexer.g4 CronParser.g4 -o ${workdir}/src/main/java/org/springframework/ide/vscode/parser/cron -package org.springframework.ide.vscode.parser.cron
 java -jar ${workdir}/antlr-${ANTLR_VERSION}.jar PropertyPlaceHolder.g4 -o ${workdir}/src/main/java/org/springframework/ide/vscode/parser/placeholder -package org.springframework.ide.vscode.parser.placeholder
-

headless-services/commons/jpql/pom.xml

@@ -13,7 +13,6 @@
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>
-			<version>${antlr.version}</version>
 		</dependency>
 	</dependencies>
 

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/cron/CronLexer.java

@@ -1,4 +1,4 @@
-// Generated from CronLexer.g4 by ANTLR 4.13.1
+// Generated from CronLexer.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.parser.cron;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
@@ -11,7 +11,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
 public class CronLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/cron/CronParser.java

@@ -1,4 +1,4 @@
-// Generated from CronParser.g4 by ANTLR 4.13.1
+// Generated from CronParser.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.parser.cron;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
@@ -9,9 +9,9 @@
 import java.util.Iterator;
 import java.util.ArrayList;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
 public class CronParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.13.1", RuntimeMetaData.VERSION); }
+	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/cron/CronParserBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from CronParser.g4 by ANTLR 4.13.1
+// Generated from CronParser.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.parser.cron;
 
 import org.antlr.v4.runtime.ParserRuleContext;

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/cron/CronParserListener.java

@@ -1,4 +1,4 @@
-// Generated from CronParser.g4 by ANTLR 4.13.1
+// Generated from CronParser.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.parser.cron;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 

headless-services/commons/jpql/src/main/java/org/springframework/ide/vscode/parser/hql/HqlBaseListener.java

@@ -1,4 +1,4 @@
-// Generated from Hql.g4 by ANTLR 4.13.1
+// Generated from Hql.g4 by ANTLR 4.13.2
 package org.springframework.ide.vscode.parser.hql;
 
 /**