diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml
index 29ced074b1..5c7c3928bb 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml
@@ -141,6 +141,22 @@
                typeId="org.eclipse.lsp4e.commandParameterType">
          </commandParameter>
       </command>
+      <command
+            id="java.execute.workspaceCommand"
+            name="Execute Java Command in Workspace">
+         <commandParameter
+               id="org.eclipse.lsp4e.path.param"
+               name="Resource Path (unnecessary, only to make lsp4e happy)"
+               optional="true"
+               typeId="org.eclipse.lsp4e.pathParameterType">
+         </commandParameter>
+         <commandParameter
+               id="org.eclipse.lsp4e.command.param"
+               name="Command id (unnecessary, only to make lsp4e happy)"
+               optional="true"
+               typeId="org.eclipse.lsp4e.commandParameterType">
+         </commandParameter>
+      </command>
    </extension>
    <extension
          point="org.eclipse.e4.ui.css.swt.theme">
diff --git a/headless-services/xml-ls-extension/pom.xml b/headless-services/xml-ls-extension/pom.xml
index 88cc93356f..fa5b92476f 100644
--- a/headless-services/xml-ls-extension/pom.xml
+++ b/headless-services/xml-ls-extension/pom.xml
@@ -15,7 +15,7 @@
 
 	<properties>
 		<dependencies.version>${project.version}</dependencies.version>
-		<lsp4xml.version>0.14.1</lsp4xml.version>
+		<lsp4xml.version>0.29.0</lsp4xml.version>
 	</properties>
 
 	<repositories>
diff --git a/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/JavaProjectCache.java b/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/JavaProjectCache.java
index ca5cf430cb..fb2a38fcdf 100644
--- a/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/JavaProjectCache.java
+++ b/headless-services/xml-ls-extension/src/main/java/org/springframework/ide/vscode/xml/JavaProjectCache.java
@@ -129,7 +129,7 @@ public JavaProjectCache(IXMLCommandService commandService, IXMLDocumentProvider
 
 	void start() {
 		// Register handler for the classpath change callback command
-		commandService.registerCommand(callbackCommandId, (params, cancelChecker) -> handleClasspathChanged(params));
+		commandService.registerCommand(callbackCommandId, (params, sharedSettings, cancelChecker) -> handleClasspathChanged(params));
 		
 		// Register classpath listener by executing the command below
 		final ExecuteCommandParams execCmdParams = new ExecuteCommandParams(JAVA_EXECUTE_WORKSPACE_COMMAND, Arrays.asList("sts.java.addClasspathListener", callbackCommandId, true));