From 51427acb1eda6866231fe126568b29582123ae4f Mon Sep 17 00:00:00 2001
From: Gesa HENTSCHKE <Gesa.HENTSCHKE@bachmann.info>
Date: Wed, 21 Feb 2024 20:49:54 +0100
Subject: [PATCH 1/2] [#262] Use LSP4E and TM4E snaphots for master build

fixes #262
---
 .../src/org/eclipse/cdt/lsp/services/ast/AstNode.java         | 4 ++--
 .../src/org/eclipse/cdt/lsp/services/ast/AstParams.java       | 4 ++--
 .../org/eclipse/cdt/lsp/services/symbolinfo/RangeAndUri.java  | 4 ++--
 .../eclipse/cdt/lsp/services/symbolinfo/SymbolDetails.java    | 4 ++--
 .../org.eclipse.cdt.lsp.target.target                         | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstNode.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstNode.java
index e3b388e0..a69f2c17 100644
--- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstNode.java
+++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstNode.java
@@ -15,9 +15,9 @@
 
 import org.eclipse.cdt.lsp.services.ClangdLanguageServer;
 import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
-import org.eclipse.lsp4j.util.ToStringBuilder;
 
 /**
  * Return type for the <em>textDocument/ast</em> request.
diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstParams.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstParams.java
index 53dafe3c..4ebc56a7 100644
--- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstParams.java
+++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/ast/AstParams.java
@@ -14,9 +14,9 @@
 import org.eclipse.cdt.lsp.services.ClangdLanguageServer;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.TextDocumentIdentifier;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
-import org.eclipse.lsp4j.util.ToStringBuilder;
 
 /**
  * Parameter object type for the <em>textDocument/ast</em> request.
diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/RangeAndUri.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/RangeAndUri.java
index acc4981f..16ba99b3 100644
--- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/RangeAndUri.java
+++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/RangeAndUri.java
@@ -13,9 +13,9 @@
 
 import org.eclipse.cdt.lsp.services.ClangdLanguageServer;
 import org.eclipse.lsp4j.Range;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
-import org.eclipse.lsp4j.util.ToStringBuilder;
 
 /**
  * Data type used in {@link SymbolDetails} for the <em>textDocument/symbolInfo</em> request.
diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/SymbolDetails.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/SymbolDetails.java
index 0a2d0383..4aa59811 100644
--- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/SymbolDetails.java
+++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/services/symbolinfo/SymbolDetails.java
@@ -12,9 +12,9 @@
 package org.eclipse.cdt.lsp.services.symbolinfo;
 
 import org.eclipse.cdt.lsp.services.ClangdLanguageServer;
+import org.eclipse.lsp4j.jsonrpc.util.Preconditions;
+import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
 import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
-import org.eclipse.lsp4j.util.Preconditions;
-import org.eclipse.lsp4j.util.ToStringBuilder;
 
 /**
  * Return type for the <em>textDocument/symbolInfo</em> request.
diff --git a/releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target b/releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target
index fb953972..eecfd98d 100644
--- a/releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target
+++ b/releng/org.eclipse.cdt.lsp.target/org.eclipse.cdt.lsp.target.target
@@ -23,7 +23,7 @@
 			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/latest/" />
+			<repository location="https://download.eclipse.org/lsp4e/snapshots/" />
 			<unit id="org.eclipse.lsp4e" version="0.0.0" />
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.0" />
 		</location>
@@ -37,7 +37,7 @@
 			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tm4e/releases/latest/" />
+			<repository location="https://download.eclipse.org/tm4e/snapshots/" />
 			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0" />
 			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0" />
 		</location>

From c7024a77bdfb43ee9cfdecc67f48b7e64793a6db Mon Sep 17 00:00:00 2001
From: Gesa HENTSCHKE <Gesa.HENTSCHKE@bachmann.info>
Date: Wed, 21 Feb 2024 21:19:28 +0100
Subject: [PATCH 2/2] Add minimum bundle version for LSP4E nad LSP4J

---
 bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF | 4 ++--
 bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
index 9714a669..b1d54261 100644
--- a/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
@@ -24,8 +24,8 @@ Require-Bundle: org.eclipse.cdt.lsp;bundle-version="0.0.0",
  org.eclipse.core.runtime;bundle-version="0.0.0",
  org.eclipse.jface;bundle-version="0.0.0",
  org.eclipse.jface.text;bundle-version="0.0.0",
- org.eclipse.lsp4e;bundle-version="0.18.0",
- org.eclipse.lsp4j;bundle-version="0.0.0",
+ org.eclipse.lsp4e;bundle-version="0.18.5",
+ org.eclipse.lsp4j;bundle-version="0.22.0",
  org.eclipse.ui.editors;bundle-version="0.0.0",
  org.eclipse.ui.ide;bundle-version="0.0.0",
  org.eclipse.ui.workbench;bundle-version="0.0.0",
diff --git a/bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF b/bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF
index cc8e33ed..ebfe36f0 100644
--- a/bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.cdt.lsp/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Bundle-Activator: org.eclipse.cdt.lsp.LspPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.lsp4e;bundle-version="0.17.3",
+ org.eclipse.lsp4e;bundle-version="0.18.5",
  org.eclipse.tm4e.ui,
  org.eclipse.tm4e.languageconfiguration,
  org.eclipse.ui.genericeditor,
@@ -28,8 +28,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions,
  org.eclipse.jface.text,
  org.eclipse.debug.ui,
- org.eclipse.lsp4j,
- org.eclipse.lsp4j.jsonrpc,
+ org.eclipse.lsp4j;bundle-version="0.22.0",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.22.0",
  org.eclipse.cdt.codan.core,
  org.eclipse.cdt.debug.ui,
  org.eclipse.ui.workbench.texteditor