From e6bfb3fd869c4d959089490ec807dad709a960c1 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Thu, 20 Apr 2023 14:11:01 +0200
Subject: [PATCH] integrate new spring model language server interface into
 Eclipse client side

---
 .../org.springframework.tooling.boot.ls/plugin.xml             | 1 +
 .../META-INF/MANIFEST.MF                                       | 3 ++-
 .../META-INF/MANIFEST.MF                                       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 6b5e33387..98298c712 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -7,6 +7,7 @@
       <server
             class="org.springframework.tooling.boot.ls.DelegatingStreamConnectionProvider"
             clientImpl="org.springframework.tooling.ls.eclipse.commons.STS4LanguageClientImpl"
+            serverInterface="org.springframework.ide.vscode.commons.protocol.spring.SpringModelLanguageServer"
             id="org.eclipse.languageserver.languages.springboot"
             label="Spring Boot Language Server"
             lastDocumentDisconnectedTimeout="2147483647">
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
index d0b5d6ac5..18f3ed254 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.ui,
  org.springsource.ide.eclipse.commons.frameworks.core,
  org.eclipse.ui.workbench,
  org.eclipse.ui.ide,
- org.eclipse.ui.editors
+ org.eclipse.ui.editors,
+ org.springframework.tooling.jdt.ls.commons;bundle-version="4.18.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.springframework.tooling.ls.eclipse.gotosymbol.GotoSymbolPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
index efb80ed6c..511463a6c 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.reactivestreams.reactive-streams
 Export-Package: org.springframework.ide.vscode.commons.protocol,
  org.springframework.ide.vscode.commons.protocol.java,
+ org.springframework.ide.vscode.commons.protocol.spring,
  org.springframework.tooling.jdt.ls.commons,
  org.springframework.tooling.jdt.ls.commons.classpath,
  org.springframework.tooling.jdt.ls.commons.java,