Skip to content

Commit ba9f253

Browse files
guwguw
authored
Introduce a JDTLS product (#514)
* Add a JDTLS product for easier consumption * Remove obsolete file
1 parent ab88f29 commit ba9f253

File tree

7 files changed

+115
-17
lines changed

7 files changed

+115
-17
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ jobs:
113113
path: |
114114
releng/products/scip-bazel-ls/target/products/*.tar.gz
115115
releng/products/scip-bazel-ls/target/products/*.zip
116+
releng/products/jdt-bazel-ls/target/products/*.tar.gz
117+
releng/products/jdt-bazel-ls/target/products/*.zip
116118
if-no-files-found: error
117119

118120
event_file:

‎eclipse_sdk.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎releng/mavenparent/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@
341341
<configuration>
342342
<products>
343343
<product>
344-
<!-- adjust configuration of the language server product (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1122529505) -->
345-
<id>scip-bazel-language-server.product</id>
346-
<archiveFileName>scip-bazel-ls</archiveFileName>
347-
<rootFolder>scip-bazel-ls</rootFolder>
344+
<!-- adjust configuration of the language server product (https://github.com/eclipse-tycho/tycho/issues/913#issuecomment-1126680550) -->
345+
<id>${tycho.product.uid}</id>
346+
<archiveFileName>${tycho.product.launcher.name}</archiveFileName>
347+
<rootFolder>${tycho.product.launcher.name}</rootFolder>
348348
</product>
349349
</products>
350350
</configuration>

‎releng/products/jdt-bazel-ls/jdt-bazel-language-server.product‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?pde version="3.5"?>
3+
4+
<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">
5+
6+
<configIni use="default">
7+
</configIni>
8+
9+
<launcherArgs>
10+
<programArgs>-nosplash
11+
</programArgs>
12+
<vmArgs>--add-modules=ALL-SYSTEM
13+
--add-opens
14+
java.base/java.util=ALL-UNNAMED
15+
--add-opens
16+
java.base/java.lang=ALL-UNNAMED
17+
</vmArgs>
18+
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
19+
</vmArgsMac>
20+
</launcherArgs>
21+
22+
<windowImages/>
23+
24+
<launcher name="jdt-bazel-ls">
25+
<win useIco="false">
26+
<bmp/>
27+
</win>
28+
</launcher>
29+
30+
<vm>
31+
</vm>
32+
33+
<plugins>
34+
<plugin id="ch.qos.logback.classic"/>
35+
<plugin id="ch.qos.logback.core"/>
36+
<plugin id="com.salesforce.bazel.eclipse.core"/>
37+
<plugin id="com.salesforce.bazel.eclipse.jdtls"/>
38+
<plugin id="com.salesforce.bazel.importedsource"/>
39+
<plugin id="com.salesforce.bazel.logback"/>
40+
<plugin id="com.salesforce.bazel.sdk"/>
41+
<plugin id="jakarta.servlet-api" version="5.0.0"/>
42+
<plugin id="org.apache.commons.commons-codec"/>
43+
<plugin id="org.apache.felix.scr"/>
44+
<plugin id="org.eclipse.ant.core"/>
45+
<plugin id="org.eclipse.buildship.core"/>
46+
<plugin id="org.eclipse.compare.core"/>
47+
<plugin id="org.eclipse.core.commands"/>
48+
<plugin id="org.eclipse.core.contenttype"/>
49+
<plugin id="org.eclipse.core.expressions"/>
50+
<plugin id="org.eclipse.core.filesystem"/>
51+
<plugin id="org.eclipse.core.jobs"/>
52+
<plugin id="org.eclipse.core.net"/>
53+
<plugin id="org.eclipse.core.resources"/>
54+
<plugin id="org.eclipse.core.runtime"/>
55+
<plugin id="org.eclipse.core.variables"/>
56+
<plugin id="org.eclipse.debug.core"/>
57+
<plugin id="org.eclipse.equinox.app"/>
58+
<plugin id="org.eclipse.equinox.common"/>
59+
<plugin id="org.eclipse.equinox.preferences"/>
60+
<plugin id="org.eclipse.equinox.registry"/>
61+
<plugin id="org.eclipse.equinox.security"/>
62+
<plugin id="org.eclipse.equinox.security.linux"/>
63+
<plugin id="org.eclipse.equinox.security.macosx"/>
64+
<plugin id="org.eclipse.equinox.security.win32"/>
65+
<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
66+
<plugin id="org.eclipse.jdt.core"/>
67+
<plugin id="org.eclipse.jdt.launching"/>
68+
<plugin id="org.eclipse.jdt.launching.macosx"/>
69+
<plugin id="org.eclipse.jdt.ls.core"/>
70+
<plugin id="org.eclipse.jdt.ls.filesystem"/>
71+
<plugin id="org.eclipse.jdt.ls.logback.appender"/>
72+
<plugin id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped"/>
73+
<plugin id="org.eclipse.m2e.apt.core"/>
74+
<plugin id="org.eclipse.m2e.core"/>
75+
<plugin id="org.eclipse.m2e.jdt"/>
76+
<plugin id="org.eclipse.m2e.maven.runtime"/>
77+
<plugin id="org.eclipse.m2e.workspace.cli"/>
78+
<plugin id="org.eclipse.osgi"/>
79+
<plugin id="org.eclipse.osgi.compatibility.state"/>
80+
<plugin id="org.eclipse.osgi.services"/>
81+
<plugin id="org.eclipse.text"/>
82+
<plugin id="org.eclipse.xtext.xbase.lib"/>
83+
</plugins>
84+
85+
<configurations>
86+
<plugin id="ch.qos.logback.classic" autoStart="true" startLevel="2" />
87+
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
88+
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
89+
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
90+
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
91+
<plugin id="org.eclipse.jdt.core" autoStart="false" startLevel="0" />
92+
<plugin id="org.eclipse.jdt.launching" autoStart="false" startLevel="0" />
93+
<plugin id="org.eclipse.jdt.ls.core" autoStart="true" startLevel="0" />
94+
</configurations>
95+
96+
<preferencesInfo>
97+
<targetfile overwrite="false"/>
98+
</preferencesInfo>
99+
100+
<cssInfo>
101+
</cssInfo>
102+
103+
</product>

‎releng/products/scip-bazel-ls/scip-bazel-language-server.product‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<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">
4+
<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">
55

66
<configIni use="default">
77
</configIni>

‎releng/target-platform/target-platform.target‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1741250669">
4+
<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1741253888">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="org.eclipse.e4.rcp.feature.group" version="4.34.0.v20241113-2009"/>
@@ -58,6 +58,8 @@
5858
</location>
5959
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
6060
<unit id="org.eclipse.jdt.ls.core" version="1.45.0.202502271238"/>
61+
<unit id="org.eclipse.jdt.ls.filesystem" version="1.45.0.202502271238"/>
62+
<unit id="org.eclipse.jdt.ls.logback.appender" version="1.45.0.202502271238"/>
6163
<repository location="https://download.eclipse.org/jdtls/milestones/1.45.0/repository/"/>
6264
</location>
6365
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">

‎releng/target-platform/target-platform.tpd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ location "https://download.eclipse.org/releases/2024-12/" {
6565

6666
location "https://download.eclipse.org/jdtls/milestones/1.45.0/repository/" {
6767
org.eclipse.jdt.ls.core
68+
org.eclipse.jdt.ls.filesystem
69+
org.eclipse.jdt.ls.logback.appender
6870
}
6971

7072
// locations below taken from eclipse.jdt.ls project (to allow building the JDT LS in same workspace)

0 commit comments

Comments
 (0)