diff --git a/ide/lsp.client/external/binaries-list b/ide/lsp.client/external/binaries-list
index dd1dd5db2fbc..9607e9ed5dc3 100644
--- a/ide/lsp.client/external/binaries-list
+++ b/ide/lsp.client/external/binaries-list
@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-E95BD5C2A465A40A66C9DC098BF95C237B80C4EB org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0
-82848D7796D399F3E5109B7331A143D7C649B520 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.13.0
-0B50BD2A6AF496803F72176AD066532DAE62574E org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.13.0
-A491B7AC91B35EC177DE629518D5A68A9C7878FC org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.13.0
-68AB471B1FED84FABA25D6CE9005B9369B503A74 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.13.0
-A57306D5D523A4750FA09B2708062EA4972AFEA2 org.eclipse.xtend:org.eclipse.xtend.lib:2.24.0
-D8F5566BA67748ED9E91856E077EE99F00E86653 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.24.0
-53FBD66084B08850258E61C838CC1FB94335E718 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.24.0
+06A0653487EA58604FC0A4FE3CDAD8324B4EE3F6 org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0
+54D19233854C1001BF909ED185907BD2F6D426A4 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.24.0
+27512DEB3601E0CBF71D61D1A5611FB99687AB8E org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.24.0
+0344965C803F97ED41685F3A7C240152D87BD1DE org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.24.0
+88456EB1BAFBE229E519E2855EFE7BD6E60518F4 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.24.0
+C2E06484ACBE829FA19E33F8B153302DC9C6CF8F org.eclipse.xtend:org.eclipse.xtend.lib:2.32.0
+588514FAFF4F224E45C0368778EB7CCF876AF589 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.32.0
+2500674018634659ECB95B413D172B0D20DCE917 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.32.0
diff --git a/ide/lsp.client/external/lsp4j-0.13.0-license.txt b/ide/lsp.client/external/lsp4j-0.24.0-license.txt
similarity index 98%
rename from ide/lsp.client/external/lsp4j-0.13.0-license.txt
rename to ide/lsp.client/external/lsp4j-0.24.0-license.txt
index 272910647988..a75e28e431d3 100644
--- a/ide/lsp.client/external/lsp4j-0.13.0-license.txt
+++ b/ide/lsp.client/external/lsp4j-0.24.0-license.txt
@@ -1,10 +1,10 @@
 Name: Eclipse Language Server Protocol Library
 Origin: Eclipse
-Version: 0.13.0
+Version: 0.24.0
 License: EPL-v20
 URL: http://www.eclipse.org/
 Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar org.eclipse.lsp4j.jsonrpc-0.13.0.jar org.eclipse.lsp4j.debug-0.13.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
+Files: org.eclipse.lsp4j-0.24.0.jar org.eclipse.lsp4j.generator-0.24.0.jar org.eclipse.lsp4j.jsonrpc-0.24.0.jar org.eclipse.lsp4j.debug-0.24.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar
 
 Eclipse Public License - v 2.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/ide/lsp.client/external/xtend-2.24.0-license.txt b/ide/lsp.client/external/xtend-2.32.0-license.txt
similarity index 99%
rename from ide/lsp.client/external/xtend-2.24.0-license.txt
rename to ide/lsp.client/external/xtend-2.32.0-license.txt
index 73a8a0cf7803..64eedfbde8a9 100644
--- a/ide/lsp.client/external/xtend-2.24.0-license.txt
+++ b/ide/lsp.client/external/xtend-2.32.0-license.txt
@@ -1,10 +1,10 @@
 Name: Eclipse Xtend library
 Origin: Eclipse
-Version: 2.24.0
+Version: 2.32.0
 License: EPL-v20
 URL: http://www.eclipse.org/
 Description: Eclipse Xtend library
-Files: org.eclipse.xtend.lib-2.24.0.jar org.eclipse.xtend.lib.macro-2.24.0.jar org.eclipse.xtext.xbase.lib-2.24.0.jar
+Files: org.eclipse.xtend.lib-2.32.0.jar org.eclipse.xtend.lib.macro-2.32.0.jar org.eclipse.xtext.xbase.lib-2.32.0.jar
 
 Eclipse Public License - v 2.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/ide/lsp.client/nbproject/project.properties b/ide/lsp.client/nbproject/project.properties
index fe126ec2a586..8cf444d070af 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -18,12 +18,12 @@
 javac.release=17
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.arch=${basedir}/arch.xml
-release.external/org.eclipse.lsp4j-0.13.0.jar=modules/ext/org.eclipse.lsp4j-0.13.0.jar
-release.external/org.eclipse.lsp4j.generator-0.13.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
-release.external/org.eclipse.lsp4j.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
-release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar
-release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar
-release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar
+release.external/org.eclipse.lsp4j-0.24.0.jar=modules/ext/org.eclipse.lsp4j-0.24.0.jar
+release.external/org.eclipse.lsp4j.generator-0.24.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.24.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.24.0.jar
+release.external/org.eclipse.lsp4j.debug-0.24.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.24.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar
+release.external/org.eclipse.xtend.lib-2.32.0.jar=modules/ext/org.eclipse.xtend.lib-2.32.0.jar
+release.external/org.eclipse.xtend.lib.macro-2.32.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.32.0.jar
+release.external/org.eclipse.xtext.xbase.lib-2.32.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.32.0.jar
 spec.version.base=1.33.0
diff --git a/ide/lsp.client/nbproject/project.xml b/ide/lsp.client/nbproject/project.xml
index 7f8f52def869..49339b124086 100644
--- a/ide/lsp.client/nbproject/project.xml
+++ b/ide/lsp.client/nbproject/project.xml
@@ -479,36 +479,36 @@
                 <package>org.netbeans.modules.lsp.client.spi</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtend.lib.macro-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtend.lib.macro-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.generator-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.generator-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtend.lib-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtend.lib-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtend.lib-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtend.lib-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtext.xbase.lib-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtext.xbase.lib-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.debug-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.debug-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.debug-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.debug-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
index 13a646a235c2..836f11345151 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/LSPBindings.java
@@ -78,12 +78,12 @@
 import org.eclipse.lsp4j.WorkspaceClientCapabilities;
 import org.eclipse.lsp4j.WorkspaceEditCapabilities;
 import org.eclipse.lsp4j.jsonrpc.Launcher;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.launch.LSPLauncher;
 import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.lsp4j.services.TextDocumentService;
 import org.eclipse.lsp4j.services.WorkspaceService;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.netbeans.api.annotations.common.NonNull;
 import org.netbeans.api.editor.mimelookup.MimeLookup;
 import org.netbeans.api.progress.*;
diff --git a/java/java.lsp.server/external/binaries-list b/java/java.lsp.server/external/binaries-list
index 4bf25a3c3f21..259395dc5f4a 100644
--- a/java/java.lsp.server/external/binaries-list
+++ b/java/java.lsp.server/external/binaries-list
@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-E95BD5C2A465A40A66C9DC098BF95C237B80C4EB org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0
-A491B7AC91B35EC177DE629518D5A68A9C7878FC org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.13.0
-82848D7796D399F3E5109B7331A143D7C649B520 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.13.0
-0B50BD2A6AF496803F72176AD066532DAE62574E org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.13.0
-68AB471B1FED84FABA25D6CE9005B9369B503A74 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.13.0
-A57306D5D523A4750FA09B2708062EA4972AFEA2 org.eclipse.xtend:org.eclipse.xtend.lib:2.24.0
-D8F5566BA67748ED9E91856E077EE99F00E86653 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.24.0
-53FBD66084B08850258E61C838CC1FB94335E718 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.24.0
+06A0653487EA58604FC0A4FE3CDAD8324B4EE3F6 org.eclipse.lsp4j:org.eclipse.lsp4j:0.24.0
+0344965C803F97ED41685F3A7C240152D87BD1DE org.eclipse.lsp4j:org.eclipse.lsp4j.debug:0.24.0
+54D19233854C1001BF909ED185907BD2F6D426A4 org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.24.0
+27512DEB3601E0CBF71D61D1A5611FB99687AB8E org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.24.0
+88456EB1BAFBE229E519E2855EFE7BD6E60518F4 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc.debug:0.24.0
+C2E06484ACBE829FA19E33F8B153302DC9C6CF8F org.eclipse.xtend:org.eclipse.xtend.lib:2.32.0
+588514FAFF4F224E45C0368778EB7CCF876AF589 org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.32.0
+2500674018634659ECB95B413D172B0D20DCE917 org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.32.0
 
diff --git a/java/java.lsp.server/external/lsp4j-0.13.0-license.txt b/java/java.lsp.server/external/lsp4j-0.24.0-license.txt
similarity index 98%
rename from java/java.lsp.server/external/lsp4j-0.13.0-license.txt
rename to java/java.lsp.server/external/lsp4j-0.24.0-license.txt
index 0febd7daaf68..a31fa2041892 100644
--- a/java/java.lsp.server/external/lsp4j-0.13.0-license.txt
+++ b/java/java.lsp.server/external/lsp4j-0.24.0-license.txt
@@ -1,10 +1,10 @@
 Name: Eclipse Language Server Protocol Library
 Origin: Eclipse
-Version: 0.13.0
+Version: 0.24.0
 License: EPL-v20
 URL: http://www.eclipse.org/
 Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.13.0.jar org.eclipse.lsp4j.debug-0.13.0.jar org.eclipse.lsp4j.generator-0.13.0.jar org.eclipse.lsp4j.jsonrpc-0.13.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
+Files: org.eclipse.lsp4j-0.24.0.jar org.eclipse.lsp4j.debug-0.24.0.jar org.eclipse.lsp4j.generator-0.24.0.jar org.eclipse.lsp4j.jsonrpc-0.24.0.jar org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar
 
 Eclipse Public License - v 2.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/java/java.lsp.server/external/xtend-2.24.0-license.txt b/java/java.lsp.server/external/xtend-2.32.0-license.txt
similarity index 99%
rename from java/java.lsp.server/external/xtend-2.24.0-license.txt
rename to java/java.lsp.server/external/xtend-2.32.0-license.txt
index 73a8a0cf7803..64eedfbde8a9 100644
--- a/java/java.lsp.server/external/xtend-2.24.0-license.txt
+++ b/java/java.lsp.server/external/xtend-2.32.0-license.txt
@@ -1,10 +1,10 @@
 Name: Eclipse Xtend library
 Origin: Eclipse
-Version: 2.24.0
+Version: 2.32.0
 License: EPL-v20
 URL: http://www.eclipse.org/
 Description: Eclipse Xtend library
-Files: org.eclipse.xtend.lib-2.24.0.jar org.eclipse.xtend.lib.macro-2.24.0.jar org.eclipse.xtext.xbase.lib-2.24.0.jar
+Files: org.eclipse.xtend.lib-2.32.0.jar org.eclipse.xtend.lib.macro-2.32.0.jar org.eclipse.xtext.xbase.lib-2.32.0.jar
 
 Eclipse Public License - v 2.0
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/java/java.lsp.server/nbproject/project.properties b/java/java.lsp.server/nbproject/project.properties
index 6baa2b43b555..967487bd7d57 100644
--- a/java/java.lsp.server/nbproject/project.properties
+++ b/java/java.lsp.server/nbproject/project.properties
@@ -23,14 +23,14 @@ requires.nb.javac=true
 test.unit.run.cp.extra=
 cp.extra=${tools.jar}
 
-release.external/org.eclipse.lsp4j-0.13.0.jar=modules/ext/org.eclipse.lsp4j-0.13.0.jar
-release.external/org.eclipse.lsp4j.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.13.0.jar
-release.external/org.eclipse.lsp4j.generator-0.13.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.13.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
-release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar
-release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar
-release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar
+release.external/org.eclipse.lsp4j-0.24.0.jar=modules/ext/org.eclipse.lsp4j-0.24.0.jar
+release.external/org.eclipse.lsp4j.debug-0.24.0.jar=modules/ext/org.eclipse.lsp4j.debug-0.24.0.jar
+release.external/org.eclipse.lsp4j.generator-0.24.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.24.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.24.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar
+release.external/org.eclipse.xtend.lib-2.32.0.jar=modules/ext/org.eclipse.xtend.lib-2.32.0.jar
+release.external/org.eclipse.xtend.lib.macro-2.32.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.32.0.jar
+release.external/org.eclipse.xtext.xbase.lib-2.32.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.32.0.jar
 
 test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir}
 
diff --git a/java/java.lsp.server/nbproject/project.xml b/java/java.lsp.server/nbproject/project.xml
index fffc512714b3..9a8acdcab18b 100644
--- a/java/java.lsp.server/nbproject/project.xml
+++ b/java/java.lsp.server/nbproject/project.xml
@@ -842,36 +842,36 @@
                 <package>org.netbeans.modules.java.lsp.server.ui</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.debug-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.debug-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.debug-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.debug-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtend.lib.macro-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtend.lib.macro-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtend.lib.macro-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.generator-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.generator-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.generator-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtend.lib-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtend.lib-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtend.lib-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtend.lib-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.24.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.xtext.xbase.lib-2.24.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.xtext.xbase.lib-2.32.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.xtext.xbase.lib-2.32.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/org.eclipse.lsp4j-0.13.0.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.lsp4j-0.13.0.jar</binary-origin>
+                <runtime-relative-path>ext/org.eclipse.lsp4j-0.24.0.jar</runtime-relative-path>
+                <binary-origin>external/org.eclipse.lsp4j-0.24.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputBoxStep.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputBoxStep.java
index b0e383819d92..b411497dbe17 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputBoxStep.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputBoxStep.java
@@ -19,8 +19,8 @@
 package org.netbeans.modules.java.lsp.server.input;
 
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputCallbackParams.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputCallbackParams.java
index f5dc05e2e98d..48b6d0d6ef91 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputCallbackParams.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/InputCallbackParams.java
@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Objects;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickItem.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickItem.java
index 40ae0082bea3..b828ea50c91f 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickItem.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickItem.java
@@ -19,8 +19,8 @@
 package org.netbeans.modules.java.lsp.server.input;
 
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickStep.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickStep.java
index a9d542a4e987..c00f56e42163 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickStep.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/QuickPickStep.java
@@ -20,8 +20,8 @@
 
 import java.util.List;
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowInputBoxParams.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowInputBoxParams.java
index 17b1fec76edc..576ecefeb822 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowInputBoxParams.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowInputBoxParams.java
@@ -19,8 +19,8 @@
 package org.netbeans.modules.java.lsp.server.input;
 
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowMutliStepInputParams.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowMutliStepInputParams.java
index 3c7304db6aba..59b57484067d 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowMutliStepInputParams.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowMutliStepInputParams.java
@@ -19,8 +19,8 @@
 package org.netbeans.modules.java.lsp.server.input;
 
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowQuickPickParams.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowQuickPickParams.java
index 30cd38999cb2..d241b7bdec58 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowQuickPickParams.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/input/ShowQuickPickParams.java
@@ -21,8 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 9607cbcb42a8..de7e69c9376b 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
@@ -961,7 +961,7 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams init) {
             hackNoReuseOfOutputsForAntProjects();
             List<FileObject> projectCandidates = new ArrayList<>();
             List<WorkspaceFolder> folders = init.getWorkspaceFolders();
-            if (folders != null) {
+            if (folders != null && !folders.isEmpty()) {
                 for (WorkspaceFolder w : folders) {
                     try {
                         projectCandidates.add(Utils.fromUri(w.getUri()));
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestProgressParams.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestProgressParams.java
index 21550fe717a1..09018f924110 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestProgressParams.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestProgressParams.java
@@ -19,8 +19,8 @@
 package org.netbeans.modules.java.lsp.server.protocol;
 
 import java.util.Objects;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestSuiteInfo.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestSuiteInfo.java
index 2907ca89ee62..d5ee0d749693 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestSuiteInfo.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TestSuiteInfo.java
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.Objects;
 import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
 import org.eclipse.xtext.xbase.lib.Pure;
 import org.eclipse.xtext.xbase.lib.util.ToStringBuilder;
 
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index db008f570c0f..93de647abc5e 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -150,6 +150,7 @@
 import org.eclipse.lsp4j.MessageType;
 import org.eclipse.lsp4j.ParameterInformation;
 import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.PrepareRenameDefaultBehavior;
 import org.eclipse.lsp4j.PrepareRenameParams;
 import org.eclipse.lsp4j.PrepareRenameResult;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
@@ -178,6 +179,7 @@
 import org.eclipse.lsp4j.WillSaveTextDocumentParams;
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.messages.Either3;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageClientAware;
@@ -1466,7 +1468,7 @@ public CompletableFuture<List<? extends TextEdit>> onTypeFormatting(DocumentOnTy
     }
 
     @Override
-    public CompletableFuture<Either<Range, PrepareRenameResult>> prepareRename(PrepareRenameParams params) {
+    public CompletableFuture<Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior>> prepareRename(PrepareRenameParams params) {
         // shortcut: if the projects are not yet initialized, return empty:
         if (server.openedProjects().getNow(null) == null) {
             return CompletableFuture.completedFuture(null);
@@ -1475,7 +1477,7 @@ public CompletableFuture<Either<Range, PrepareRenameResult>> prepareRename(Prepa
         if (source == null) {
             return CompletableFuture.completedFuture(null);
         }
-        CompletableFuture<Either<Range, PrepareRenameResult>> result = new CompletableFuture<>();
+        CompletableFuture<Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior>> result = new CompletableFuture<>();
         try {
             source.runUserActionTask(cc -> {
                 cc.toPhase(JavaSource.Phase.RESOLVED);
@@ -1512,7 +1514,7 @@ public CompletableFuture<Either<Range, PrepareRenameResult>> prepareRename(Prepa
                         }
                         Range r = new Range(Utils.createPosition(cc.getCompilationUnit(), ts.offset()),
                                             Utils.createPosition(cc.getCompilationUnit(), ts.offset() + ts.token().length()));
-                        result.complete(Either.forRight(new PrepareRenameResult(r, ts.token().text().toString())));
+                        result.complete(Either3.forSecond(new PrepareRenameResult(r, ts.token().text().toString())));
                     } else {
                         result.complete(null);
                     }
diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
index 39c69f6c251e..017f34d81be8 100644
--- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
+++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
@@ -1301,7 +1301,8 @@ public void logMessage(MessageParams arg0) {
         serverLauncher.startListening();
         LanguageServer server = serverLauncher.getRemoteProxy();
         InitializeParams initParams = new InitializeParams();
-        initParams.setWorkspaceFolders(Arrays.asList(new WorkspaceFolder(root.getFileObject("jdk/src/java.base").toURI().toString())));
+        FileObject javaBase = root.getFileObject("jdk/src/java.base");
+        initParams.setWorkspaceFolders(Arrays.asList(new WorkspaceFolder(javaBase.toURI().toString(), javaBase.getNameExt())));
         InitializeResult result = server.initialize(initParams).get();
         synchronized (indexingComplete) {
             while (!indexingComplete[0]) {
@@ -5715,7 +5716,7 @@ public void showMessage(MessageParams params) {
         serverLauncher.startListening();
         LanguageServer server = serverLauncher.getRemoteProxy();
         InitializeParams initP = new InitializeParams();
-        WorkspaceFolder wf = new WorkspaceFolder(wdBase.toURI().toString());
+        WorkspaceFolder wf = new WorkspaceFolder(wdBase.toURI().toString(), wdBase.getName());
         initP.setWorkspaceFolders(Collections.singletonList(wf));
         InitializeResult result = server.initialize(initP).get();
         
@@ -5913,10 +5914,15 @@ public CompletableFuture<ApplyWorkspaceEditResponse> applyEdit(ApplyWorkspaceEdi
 
             @Override
             public CompletableFuture<List<Object>> configuration(ConfigurationParams configurationParams) {
-                assertEquals(1, configurationParams.getItems().size());
-                ConfigurationItem item = configurationParams.getItems().get(0);
-                assertEquals("netbeans.inlay.enabled", item.getSection());
-                return CompletableFuture.completedFuture(Arrays.asList(JsonParser.parseString(settings[0])));
+                List<Object> res = new ArrayList<>(configurationParams.getItems().size());
+                for (ConfigurationItem item : configurationParams.getItems()) {
+                    if ("netbeans.inlay.enabled".equals(item.getSection())) {
+                        res.add(JsonParser.parseString(settings[0]));
+                    } else {
+                        res.add(new JsonObject());
+                    }
+                }
+                return CompletableFuture.completedFuture(res);
             }
 
         }, client.getInputStream(), client.getOutputStream());
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 488c1f12452b..6468119d931e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -66,14 +66,14 @@ extide/gradle/external/gradle-8.11.1-bin.zip platform/libs.testng/external/jcomm
 enterprise/javaee.api/external/javax.annotation-api-1.2.jar enterprise/javaee7.api/external/javax.annotation-api-1.2.jar
 
 # ide/lsp.client and java/java.lsp.server both use LSP libraries, but are independent:
-ide/lsp.client/external/org.eclipse.lsp4j-0.13.0.jar java/java.lsp.server/external/org.eclipse.lsp4j-0.13.0.jar
-ide/lsp.client/external/org.eclipse.lsp4j.debug-0.13.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.debug-0.13.0.jar
-ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc.debug-0.13.0.jar
-ide/lsp.client/external/org.eclipse.lsp4j.generator-0.13.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.generator-0.13.0.jar
-ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc-0.13.0.jar
-ide/lsp.client/external/org.eclipse.xtend.lib-2.24.0.jar java/java.lsp.server/external/org.eclipse.xtend.lib-2.24.0.jar
-ide/lsp.client/external/org.eclipse.xtend.lib.macro-2.24.0.jar java/java.lsp.server/external/org.eclipse.xtend.lib.macro-2.24.0.jar
-ide/lsp.client/external/org.eclipse.xtext.xbase.lib-2.24.0.jar java/java.lsp.server/external/org.eclipse.xtext.xbase.lib-2.24.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j-0.24.0.jar java/java.lsp.server/external/org.eclipse.lsp4j-0.24.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.debug-0.24.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.debug-0.24.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc.debug-0.24.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.generator-0.24.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.generator-0.24.0.jar
+ide/lsp.client/external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar java/java.lsp.server/external/org.eclipse.lsp4j.jsonrpc-0.24.0.jar
+ide/lsp.client/external/org.eclipse.xtend.lib-2.32.0.jar java/java.lsp.server/external/org.eclipse.xtend.lib-2.32.0.jar
+ide/lsp.client/external/org.eclipse.xtend.lib.macro-2.32.0.jar java/java.lsp.server/external/org.eclipse.xtend.lib.macro-2.32.0.jar
+ide/lsp.client/external/org.eclipse.xtext.xbase.lib-2.32.0.jar java/java.lsp.server/external/org.eclipse.xtext.xbase.lib-2.32.0.jar
 
 # Derby jar is used when run tests, so we can ignore the duplicates
 ide/db/external/derby-10.14.2.0.jar ide/db.metadata.model/external/derby-10.14.2.0.jar