From cb74888bec48175dd2ec4771be77568029b0ab3f Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Thu, 6 Mar 2025 10:40:34 +0100
Subject: [PATCH 1/2] Add a JDTLS product for easier consumption

---
 .github/workflows/ci.yml                      |   2 +
 releng/mavenparent/pom.xml                    |   8 +-
 .../jdt-bazel-language-server.product         | 103 ++++++++++++++++++
 .../scip-bazel-language-server.product        |   2 +-
 releng/target-platform/target-platform.target |   4 +-
 releng/target-platform/target-platform.tpd    |   2 +
 6 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 releng/products/jdt-bazel-ls/jdt-bazel-language-server.product

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7634d81d..8d699f2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -113,6 +113,8 @@ jobs:
           path: |
             releng/products/scip-bazel-ls/target/products/*.tar.gz
             releng/products/scip-bazel-ls/target/products/*.zip
+            releng/products/jdt-bazel-ls/target/products/*.tar.gz
+            releng/products/jdt-bazel-ls/target/products/*.zip
           if-no-files-found: error
             
   event_file:
diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml
index 0dd2ed9c..04e12c86 100644
--- a/releng/mavenparent/pom.xml
+++ b/releng/mavenparent/pom.xml
@@ -341,10 +341,10 @@
 					<configuration>
 						<products>
 							<product>
-								<!-- adjust configuration of the language server product (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1122529505) -->
-								<id>scip-bazel-language-server.product</id>
-								<archiveFileName>scip-bazel-ls</archiveFileName>
-								<rootFolder>scip-bazel-ls</rootFolder>
+								<!-- adjust configuration of the language server product (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1126680550) -->
+								<id>${tycho.product.uid}</id>
+								<archiveFileName>${tycho.product.launcher.name}</archiveFileName>
+								<rootFolder>${tycho.product.launcher.name}</rootFolder>
 							</product>
 						</products>
 					</configuration>
diff --git a/releng/products/jdt-bazel-ls/jdt-bazel-language-server.product b/releng/products/jdt-bazel-ls/jdt-bazel-language-server.product
new file mode 100644
index 00000000..f8493a08
--- /dev/null
+++ b/releng/products/jdt-bazel-ls/jdt-bazel-language-server.product
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="JDT Language Server with Bazel Extension" uid="jdt-bazel-ls" id="org.eclipse.jdt.ls.core.product" application="org.eclipse.jdt.ls.core.id1" version="1.0.0" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-nosplash
+      </programArgs>
+      <vmArgs>--add-modules=ALL-SYSTEM
+--add-opens
+java.base/java.util=ALL-UNNAMED
+--add-opens
+java.base/java.lang=ALL-UNNAMED
+      </vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher name="jdt-bazel-ls">
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="ch.qos.logback.classic"/>
+      <plugin id="ch.qos.logback.core"/>
+      <plugin id="com.salesforce.bazel.eclipse.core"/>
+      <plugin id="com.salesforce.bazel.eclipse.jdtls"/>
+      <plugin id="com.salesforce.bazel.importedsource"/>
+      <plugin id="com.salesforce.bazel.logback"/>
+      <plugin id="com.salesforce.bazel.sdk"/>
+      <plugin id="jakarta.servlet-api" version="5.0.0"/>
+      <plugin id="org.apache.commons.commons-codec"/>
+      <plugin id="org.apache.felix.scr"/>
+      <plugin id="org.eclipse.ant.core"/>
+      <plugin id="org.eclipse.buildship.core"/>
+      <plugin id="org.eclipse.compare.core"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.filesystem"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.net"/>
+      <plugin id="org.eclipse.core.resources"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.variables"/>
+      <plugin id="org.eclipse.debug.core"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.equinox.security.linux"/>
+      <plugin id="org.eclipse.equinox.security.macosx"/>
+      <plugin id="org.eclipse.equinox.security.win32"/>
+      <plugin id="org.eclipse.jdt.apt.pluggable.core"/>
+      <plugin id="org.eclipse.jdt.core"/>
+      <plugin id="org.eclipse.jdt.launching"/>
+      <plugin id="org.eclipse.jdt.launching.macosx"/>
+      <plugin id="org.eclipse.jdt.ls.core"/>
+      <plugin id="org.eclipse.jdt.ls.filesystem"/>
+      <plugin id="org.eclipse.jdt.ls.logback.appender"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped"/>
+      <plugin id="org.eclipse.m2e.apt.core"/>
+      <plugin id="org.eclipse.m2e.core"/>
+      <plugin id="org.eclipse.m2e.jdt"/>
+      <plugin id="org.eclipse.m2e.maven.runtime"/>
+      <plugin id="org.eclipse.m2e.workspace.cli"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.osgi.compatibility.state"/>
+      <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.text"/>
+      <plugin id="org.eclipse.xtext.xbase.lib"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="ch.qos.logback.classic" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.jdt.core" autoStart="false" startLevel="0" />
+      <plugin id="org.eclipse.jdt.launching" autoStart="false" startLevel="0" />
+      <plugin id="org.eclipse.jdt.ls.core" autoStart="true" startLevel="0" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
diff --git a/releng/products/scip-bazel-ls/scip-bazel-language-server.product b/releng/products/scip-bazel-ls/scip-bazel-language-server.product
index 357e91d8..c88c17dc 100644
--- a/releng/products/scip-bazel-ls/scip-bazel-language-server.product
+++ b/releng/products/scip-bazel-ls/scip-bazel-language-server.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Scip Bazel Language Server" uid="scip-bazel-language-server.product" id="com.salesforce.bazel.scipls.product.server" application="com.salesforce.bazel.scipls.app.server" version="1.0.0" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Scip Bazel Language Server" uid="scip-bazel-ls" id="com.salesforce.bazel.scipls.product.server" application="com.salesforce.bazel.scipls.app.server" version="1.0.0" type="bundles" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/releng/target-platform/target-platform.target b/releng/target-platform/target-platform.target
index d00b1076..a83c227a 100644
--- a/releng/target-platform/target-platform.target
+++ b/releng/target-platform/target-platform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1741250669">
+<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1741253888">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.e4.rcp.feature.group" version="4.34.0.v20241113-2009"/>
@@ -58,6 +58,8 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jdt.ls.core" version="1.45.0.202502271238"/>
+      <unit id="org.eclipse.jdt.ls.filesystem" version="1.45.0.202502271238"/>
+      <unit id="org.eclipse.jdt.ls.logback.appender" version="1.45.0.202502271238"/>
       <repository location="https://download.eclipse.org/jdtls/milestones/1.45.0/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd
index be69f189..34016117 100644
--- a/releng/target-platform/target-platform.tpd
+++ b/releng/target-platform/target-platform.tpd
@@ -65,6 +65,8 @@ location "https://download.eclipse.org/releases/2024-12/" {
 
 location "https://download.eclipse.org/jdtls/milestones/1.45.0/repository/" {
 	org.eclipse.jdt.ls.core
+	org.eclipse.jdt.ls.filesystem
+	org.eclipse.jdt.ls.logback.appender
 }
 
 // locations below taken from eclipse.jdt.ls project (to allow building the JDT LS in same workspace)

From e84791fd2c9afa23c5e1a9903744e1ff0eae372a Mon Sep 17 00:00:00 2001
From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Thu, 6 Mar 2025 11:18:59 +0100
Subject: [PATCH 2/2] Remove obsolete file

---
 eclipse_sdk.sh | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100755 eclipse_sdk.sh

diff --git a/eclipse_sdk.sh b/eclipse_sdk.sh
deleted file mode 100755
index f09e1fe6..00000000
--- a/eclipse_sdk.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# when developing the feature, it is useful to be explicit about which Eclipse SDK instance you are launching
-
-set -e -x
-
-# create a my_env.sh and set $ECLIPSE_DIR
-source my_env.sh
-
-# Mac path, update if you are on another platform
-$ECLIPSE_DIR/Eclipse.app/Contents/MacOS/eclipse &