Create a LS product including JustJ

salesforce · Nov 7, 2024 · 169c29b · 169c29b
1 parent 6c3aa52
commit 169c29b
Show file tree

Hide file tree

Showing 8 changed files with 163 additions and 11 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -47,8 +47,18 @@ jobs:
           path: bazel-eclipse-latest
           skip_unpack: true
 
-      - name: Extract p2 Repository
-        run: unzip bazel-eclipse-latest/p2-repository.zip -d bazel-eclipse-latest
+      - name: Download Products
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          run_id: ${{ github.event.workflow_run.id }}
+          name: products
+          path: bazel-eclipse-latest
+          skip_unpack: true
+
+      - name: Extract downloaded artifacts
+        run: |
+          unzip bazel-eclipse-latest/p2-repository.zip -d bazel-eclipse-latest
+          unzip bazel-eclipse-latest/products.zip -d bazel-eclipse-latest
 
       - name: Assemble pages folder
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,6 +104,16 @@ jobs:
           name: p2-repository
           path: releng/p2repository/target/repository/
           if-no-files-found: error
+
+      - name: Upload Products
+        uses: actions/upload-artifact@v4
+        if: success() && matrix.os == 'ubuntu-latest'
+        with:
+          name: products
+          path: |
+            releng/products/target/products/*.tar.gz
+            releng/products/target/products/*.zip
+          if-no-files-found: error
 
   event_file:
     name: "Event File" 

diff --git a/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs b/bundles/com.salesforce.bazel.scipls/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true

diff --git a/bundles/com.salesforce.bazel.scipls/plugin.xml b/bundles/com.salesforce.bazel.scipls/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>
    <extension
          id="com.salesforce.bazel.scipls.app.server"
-         name="SCIP based Bazel Language Server"
+         name="SCIP Bazel Language Server"
          point="org.eclipse.core.runtime.applications">
       <application
             cardinality="singleton-global"
@@ -14,5 +14,17 @@
          </run>
       </application>
    </extension>
+   <extension
+         id="com.salesforce.bazel.scipls.product.server"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="com.salesforce.bazel.scipls.app.server"
+            name="SCIP Bazel Language Server">
+         <property
+               name="appName"
+               value="SCIP Bazel Language Server">
+         </property>
+      </product>
+   </extension>
 
 </plugin>
diff --git a/releng/mavenparent/pom.xml b/releng/mavenparent/pom.xml
@@ -29,7 +29,8 @@
 		<surefire-reports-directory>${project.build.directory}/surefire-reports</surefire-reports-directory>
 		<test.vmparams>-Xmx1024m</test.vmparams>
 		<coretest.vmparams></coretest.vmparams>
-		<uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots</uitest.vmparams>
+		<uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=30000
+			-Dorg.eclipse.swtbot.screenshots.dir=target/screenshots</uitest.vmparams>
 
 		<tycho.version>4.0.9</tycho.version>
 
@@ -119,7 +120,8 @@
 				</os>
 			</activation>
 			<properties>
-				<ui.test.vmargs>-XstartOnFirstThread ${test.vmparams} ${uitest.vmparams}</ui.test.vmargs>
+				<ui.test.vmargs>-XstartOnFirstThread ${test.vmparams}
+					${uitest.vmparams}</ui.test.vmargs>
 			</properties>
 		</profile>
 		<profile>
@@ -210,8 +212,22 @@
 							<ws>win32</ws>
 							<arch>x86_64</arch>
 						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>aarch64</arch>
+						</environment>
 					</environments>
 					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
+					<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-21</executionEnvironment>
+					<!--
+					<resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
+					<dependency-resolution>
+						<profileProperties>
+							<org.eclipse.justj.buildtime>true</org.eclipse.justj.buildtime>
+						</profileProperties>
+					</dependency-resolution>
+					-->
 				</configuration>
 			</plugin>
 			<plugin>
@@ -235,7 +251,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<!-- generatre p2 metadata so source feature can be consumed in update site -->
+				<!-- generatre p2 metadata so source feature can be consumed in
+				update site -->
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
 				<executions>

diff --git a/releng/products/scip-bazel-language-server.product b/releng/products/scip-bazel-language-server.product
@@ -0,0 +1,96 @@
+<?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">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher>
+      <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.importedsource"/>
+      <plugin id="com.salesforce.bazel.logback"/>
+      <plugin id="com.salesforce.bazel.scipls"/>
+      <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.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.core.javac"/>
+-->
+      <plugin id="org.eclipse.jdt.launching"/>
+      <plugin id="org.eclipse.jdt.launching.macosx"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped"/>
+<!--
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.linux.aarch64"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.linux.x86_64"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.macosx.aarch64"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.macosx.x86_64"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.win32.aarch64"/>
+      <plugin id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.win32.x86_64"/>
+-->
+      <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="com.salesforce.bazel.scipls" autoStart="true" startLevel="0" />
+      <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" />
+   </configurations>
+
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
+</product>
diff --git 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="1730815924">
+<target name="bazel-eclipse-feature-target-platform" sequenceNumber="1730981039">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.e4.rcp.feature.group" version="4.33.0.v20240903-0618"/>
@@ -41,7 +41,6 @@
       <unit id="ch.qos.logback.core" version="1.5.7"/>
       <unit id="ch.qos.logback.classic" version="1.5.7"/>
       <unit id="jakarta.servlet-api" version="5.0.0"/>
-      <unit id="jakarta.servlet-api" version="6.1.0"/>
       <unit id="com.google.errorprone.annotations" version="2.30.0"/>
       <unit id="com.google.gson" version="2.11.0"/>
       <unit id="com.google.guava" version="33.3.0.jre"/>
@@ -84,6 +83,10 @@
       <unit id="org.eclipse.buildship.feature.group" version="3.1.10.v20240802-1211"/>
       <repository location="https://download.eclipse.org/buildship/updates/e431/releases/3.x/3.1.10.v20240802-1211/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped" version="21.0.5.v20241023-1957"/>
+      <repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.5/"/>
+    </location>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven" label="ScipMavenDependencies">
       <feature id="com.salesforce.bazel.scip.dependencies.feature" label="Third-Party Dependencies used by the Bazel SCIP Feature" provider-name="" version="2.0.0.qualifier">
       </feature>

diff --git a/releng/target-platform/target-platform.tpd b/releng/target-platform/target-platform.tpd
@@ -90,6 +90,10 @@ location "https://download.eclipse.org/buildship/updates/e431/releases/3.x/3.1.1
 	org.eclipse.buildship.feature.group
 }
 
+location "https://download.eclipse.org/justj/jres/21/updates/release/21.0.5/" {
+	org.eclipse.justj.openjdk.hotspot.jre.full.stripped
+}
+
 maven MavenDependencies scope=compile dependencyDepth=infinite missingManifest=generate includeSources {
 	feature {
 		id="com.salesforce.bazel.eclipse.dependencies.feature"