From dbb8898e0ffe41bfaa09959af007dac332c8c771 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Sun, 14 Apr 2024 14:25:18 -0400
Subject: [PATCH] Adopt JDT LS 1.34.0 by the JDT LS extension

---
 .../org.springframework.tooling.jdt.ls.extension/.classpath | 2 +-
 .../META-INF/MANIFEST.MF                                    | 3 ++-
 .../tooling/jdt/ls/extension/JavadocHoverLinkHandler.java   | 6 +++---
 headless-services/jdt-ls-extension/pom.xml                  | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/.classpath b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/.classpath
index cf36b5611..5508535a4 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/.classpath
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
index ed8c11fdf..6ddb91fb6 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.jdt.ls.core,
  org.springframework.tooling.jdt.ls.commons,
  com.google.guava,
  org.eclipse.lsp4j,
- org.eclipse.lsp4j.jsonrpc
+ org.eclipse.lsp4j.jsonrpc,
+ org.eclipse.jdt.core.manipulation
 Import-Package: com.google.gson;version="2.7.0",
  com.google.gson.annotations;version="2.7.0",
  com.google.gson.reflect;version="2.7.0",
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/src/org/springframework/tooling/jdt/ls/extension/JavadocHoverLinkHandler.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/src/org/springframework/tooling/jdt/ls/extension/JavadocHoverLinkHandler.java
index 466b1eaab..d4f717279 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/src/org/springframework/tooling/jdt/ls/extension/JavadocHoverLinkHandler.java
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.extension/src/org/springframework/tooling/jdt/ls/extension/JavadocHoverLinkHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2023 Pivotal, Inc.
+ * Copyright (c) 2018, 2024 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,8 +16,8 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.internal.ui.viewsupport.CoreJavaElementLinks;
 import org.eclipse.jdt.ls.core.internal.IDelegateCommandHandler;
-import org.eclipse.jdt.ls.core.internal.javadoc.JavaElementLinks;
 import org.springframework.tooling.jdt.ls.commons.java.JavaData;
 
 public class JavadocHoverLinkHandler implements IDelegateCommandHandler {
@@ -34,7 +34,7 @@ public class JavadocHoverLinkHandler implements IDelegateCommandHandler {
 			if (element != null) {
 				// Bug in JDT server one '(' not encoded while everything else in the query is
 				// encoded
-				return JavaElementLinks.createURI(null, element).replace("(", "%28");
+				return CoreJavaElementLinks.createURI(null, element).replace("(", "%28");
 			}
 		} catch (Exception e) {
 			JdtLsExtensionPlugin.getInstance().getLog().error("Failed to compute java data for " + bindingKey + " in project " + uri, e);
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index b61fc20c1..832c9a8da 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -45,7 +45,7 @@
 	</modules>
 
 	<properties>
-		<tycho-version>4.0.4</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 
 		<!-- Signing -->
 		<signing.skip>true</signing.skip>
@@ -97,14 +97,14 @@
 		<repository>
 			<id>eclipse-2023-09</id>
 			<layout>p2</layout>
-			<url>https://download.eclipse.org/releases/2023-09</url>
+			<url>https://download.eclipse.org/releases/2024-03</url>
 		</repository>
 
 		<repository>
 			<id>JDT.LS</id>
 			<layout>p2</layout>
 			<!-- <url>${jdt.ls.updatesite}</url> -->
-			<url>https://download.eclipse.org/jdtls/milestones/1.17.0/repository/</url>
+			<url>https://download.eclipse.org/jdtls/milestones/1.34.0/repository/</url>
 <!--			<url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url> -->
 <!-- The latest JDT LS requires a JDK 17, so we need to run builds on a JDK 17 and raise the minimum level to JDK 17 -->
 <!-- In order to avoid this for the 2022-06-based release, I set the JDK LS version here to the latest milestone that does NOT require JDK 17 yet -->