Merge pull request #3332 from eclipse-xtext/cd-lsp4j-024

update to lsp4j 0.24.0
eclipse-xtext · Feb 1, 2025 · 2fb90d5 · 2fb90d5
2 parents 09af658 + 2449f5a
commit 2fb90d5
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
@@ -129,7 +129,7 @@
 		<junit-jupiter-version>5.10.2</junit-jupiter-version>
 		<org.eclipse.emf.mwe2-version>2.21.0.M1</org.eclipse.emf.mwe2-version>
 		<org.eclipse.emf.mwe-version>1.15.0.M1</org.eclipse.emf.mwe-version>
-		<org.eclipse.lsp4j-version>0.23.1</org.eclipse.lsp4j-version>
+		<org.eclipse.lsp4j-version>0.24.0</org.eclipse.lsp4j-version>
 		<org.eclipse.jdt.core-version>3.37.0</org.eclipse.jdt.core-version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 	</properties>

diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.31.0",
  org.eclipse.xtext.ide;bundle-version="2.38.0",
  org.junit;bundle-version="4.13.2",
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
  org.eclipse.xtext.testlanguages;bundle-version="2.38.0",
  org.eclipse.xtext.testlanguages.ide;bundle-version="2.38.0",
  org.eclipse.emf.mwe2.lib;bundle-version="2.21.0",

diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.xtend.lib;bundle-version="2.38.0",
  org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.equinox.common;bundle-version="3.19.0",
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
  org.eclipse.emf.ecore.change;bundle-version="2.16.0"
 Import-Package: org.apache.log4j;version="1.2.26"
 Export-Package: org.eclipse.xtext.ide;version="2.38.0";

diff --git a/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java b/org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 itemis AG (http://www.itemis.eu) and others.
+ * Copyright (c) 2024, 2025 itemis AG (http://www.itemis.eu) and others.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
@@ -89,7 +89,7 @@ public String put(String key, String value) {
 		}
 	}
 
-	private static final String LSP4J_VERSION = "[0.23.1,0.24.0)";
+	private static final String LSP4J_VERSION = "[0.24.0,0.25.0)";
 
 	private static void addMissingVersions(Map<String, String> bundleToVersion) {
 		bundleToVersion.put("org.hamcrest.core", "2.2.0");

diff --git a/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.xtext.ide;bundle-version="2.38.0";visibility:=reexport,
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
  org.eclipse.xtend.lib;bundle-version="2.38.0",
  org.eclipse.xtext.testing;bundle-version="2.38.0"
 Import-Package: jakarta.inject;version="2.0.1",

diff --git a/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing.tests/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: Eclipse Xtext
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.xtext.ide;bundle-version="2.38.0";visibility:=reexport,
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
  org.junit;bundle-version="4.13.2",
  org.eclipse.xtend.lib;bundle-version="2.38.0",
  org.eclipse.xtext.testing;bundle-version="2.38.0"

diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Export-Package: org.eclipse.xtext.testing;version="2.38.0",
  org.eclipse.xtext.testing.validation;version="2.38.0"
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.xtext.ide;bundle-version="2.38.0";visibility:=reexport,
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,0.25.0)";resolution:=optional,
  org.junit;bundle-version="4.13.2",
  org.eclipse.xtend.lib;bundle-version="2.38.0"
 Import-Package: org.apache.log4j;version="1.2.26",

diff --git a/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.ide/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.38.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.38.0",
  org.objectweb.asm;bundle-version="[9.7.1,9.8.0)",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.lsp4j;bundle-version="[0.23.1,0.24.0)";resolution:=optional
+ org.eclipse.lsp4j;bundle-version="[0.24.0,0.25.0)";resolution:=optional
 Export-Package: org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr;version="2.38.0";x-friends:="org.eclipse.xtext.xbase.ui",
  org.eclipse.xtext.xbase.annotations.ide.contentassist.antlr.internal;version="2.38.0";x-friends:="org.eclipse.xtext.xbase.ui",
  org.eclipse.xtext.xbase.ide;version="2.38.0",

diff --git a/xtext-latest.target b/xtext-latest.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-latest" sequenceNumber="36">
+<target name="xtext-latest" sequenceNumber="37">
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -30,7 +30,7 @@
 			<repository location="https://download.eclipse.org/eclipse/updates/4.35-I-builds" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202403.target b/xtext-r202403.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202403" sequenceNumber="36">
+<target name="xtext-r202403" sequenceNumber="37">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0"/>
@@ -26,7 +26,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202406.target b/xtext-r202406.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202406" sequenceNumber="36">
+<target name="xtext-r202406" sequenceNumber="37">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.38.0"/>
@@ -26,7 +26,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202409.target b/xtext-r202409.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202409" sequenceNumber="36">
+<target name="xtext-r202409" sequenceNumber="37">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0"/>
@@ -26,7 +26,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/xtext-r202412.target b/xtext-r202412.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="xtext-r202412" sequenceNumber="36">
+<target name="xtext-r202412" sequenceNumber="37">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.40.0"/>
@@ -26,7 +26,7 @@
 			<unit id="org.eclipse.buildship.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0"/>
 			<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">