From c2d788eb24fd34a327781bae0afa21f24c0905a3 Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Thu, 10 Apr 2025 10:56:02 +0200
Subject: [PATCH 1/2] Add velocity bundle required for LS

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e89e89a..c008062 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
 		"javaExtensions": [
 			"./server/org.eclipse.equinox.event.jar",
 			"./server/com.github.ben-manes.caffeine.jar",
+			"./server/org.apache.velocity.engine-core.jar",
 			"./server/org.jsr-305.jar",
 			"./server/org.fusesource.jansi.jar",
 			"./server/com.google.protobuf.jar",

From 5668758dc3b62e35c600c6406851b1d8bf05449b Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Thu, 10 Apr 2025 12:26:52 +0200
Subject: [PATCH 2/2] Fix Gulpfile to not mangle jars

---
 gulpfile.js | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 958781d..07429f1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -144,13 +144,33 @@ function downloadServerImpl() {
 
 function buildServerImpl() {
 	fs.rmSync('./server', { recursive: true, force: true });
-	cp.execSync(mvnw() + ' clean package -DskipTests=true', {
-		cwd: BAZEL_ECLIPSE_DIR,
-		stdio: [0, 1, 2],
-	});
+	const jdtlsJar = fs
+		.readdirSync(
+			BAZEL_ECLIPSE_DIR + '/releng/p2repository/target/repository/plugins/'
+		)
+		.find(
+			(file) =>
+				file.startsWith('com.salesforce.bazel.eclipse.jdtls') &&
+				file.endsWith('.jar')
+		);
+
+	if (jdtlsJar) {
+		console.log(
+			'NOTE: skipping build and re-using existing "' +
+				jdtlsJar +
+				'" from ../bazel-eclipse/releng/p2repository/target/repository/plugins'
+		);
+	} else {
+		cp.execSync(mvnw() + ' clean package -DskipTests=true', {
+			cwd: BAZEL_ECLIPSE_DIR,
+			stdio: [0, 1, 2],
+		});
+	}
 	gulp
 		.src(
-			BAZEL_ECLIPSE_DIR + '/releng/p2repository/target/repository/plugins/*.jar'
+			BAZEL_ECLIPSE_DIR +
+				'/releng/p2repository/target/repository/plugins/*.jar',
+			{ encoding: false } // prevent gulp from reading the content as it's not needed
 		)
 		.pipe(DROP_JAR_VERSION)
 		.pipe(jarIsIncludedInPackageJson)