From edc02111700540373f6c54d102906713feb9f6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Fri, 17 Nov 2023 14:11:54 +0200
Subject: [PATCH] Build against jdt-core-incubator

Changes to target platform are quite big as:
* jdt feature can't be used
* thus jdt.launching.macos have to be included manually
* as ^^ is a fragment locations have to be switched to
includeAllPlatform and use slicer mode
* deps have to be moved to Maven as slicer can't resolve between
locations
---
 .../org.eclipse.jdt.ls.tp.target              | 122 +++++++++++++++---
 1 file changed, 103 insertions(+), 19 deletions(-)

diff --git a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
index 7c20d8b803..390a790608 100644
--- a/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
+++ b/org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
@@ -2,45 +2,105 @@
 <?pde version="3.8"?>
 <target includeMode="feature" name="Java Language Server Target Definition" sequenceNumber="113">
     <locations>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+        <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+			<unit id="org.gradle.toolingapi" version="0.0.0"/>
             <unit id="org.eclipse.buildship.feature.group" version="0.0.0"/>
+            <unit id="org.slf4j.api" version="0.0.0"/>
             <repository location="https://download.eclipse.org/buildship/updates/e423/snapshots/3.x/3.1.7.v20221108-1729-s/"/>
         </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="org.eclipse.m2e.jdt" version="0.0.0"/>
-            <unit id="org.eclipse.m2e.apt.core" version="0.0.0"/>
-            <unit id="org.eclipse.m2e.core" version="0.0.0"/>
-            <unit id="org.eclipse.m2e.maven.runtime" version="0.0.0"/>
-            <unit id="org.eclipse.m2e.workspace.cli" version="0.0.0"/>
-            <unit id="ch.qos.logback.classic" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/technology/m2e/releases/2.4.0/"/>
-        </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+        <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.equinox.core.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-            <unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
-            <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.equinox.security.linux" version="0.0.0"/>
+            <unit id="org.eclipse.core.net" version="0.0.0"/>
+            <unit id="org.eclipse.core.net.win32" version="0.0.0"/>
+            <unit id="org.eclipse.debug.core" version="0.0.0"/>
+            <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+            <unit id="org.eclipse.core.resources" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.apt.pluggable.core" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.core.manipulation" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.debug" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.launching" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.launching.macosx" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.junit.core" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.junit.runtime" version="0.0.0"/>
+            <unit id="org.eclipse.search.core" version="0.0.0"/>
+            <unit id="org.junit" version="0.0.0"/>
+            <unit id="org.hamcrest" version="0.0.0"/>
+            <unit id="org.hamcrest.core" version="0.0.0"/>
             <unit id="org.mockito.mockito-core" version="0.0.0"/>
+            <unit id="net.bytebuddy.byte-buddy" version="0.0.0"/>
+            <unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
+            <unit id="org.objenesis" version="0.0.0"/>
             <unit id="org.apache.commons.commons-io" version="0.0.0"/>
+            <unit id="com.google.gson" version="0.0.0"/>
+            <unit id="com.sun.jna" version="0.0.0"/>
             <repository location="https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231030-1800/"/>
         </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+        <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.m2e.jdt" version="0.0.0"/>
+            <unit id="org.eclipse.m2e.apt.core" version="0.0.0"/>
+            <unit id="org.eclipse.m2e.core" version="0.0.0"/>
+            <unit id="org.eclipse.m2e.maven.runtime" version="0.0.0"/>
+            <unit id="org.eclipse.m2e.workspace.cli" version="0.0.0"/>
+            <unit id="ch.qos.logback.classic" version="0.0.0"/>
+            <repository location="https://download.eclipse.org/technology/m2e/releases/2.4.0/"/>
+        </location>
+         <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.core" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.apt.core" version="0.0.0"/>
+            <repository location="https://download.eclipse.org/jdtls/jdt-core-incubator/snapshots/"/>
+        </location>
+        <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
             <repository location="https://download.eclipse.org/releases/2023-09/"/>
         </location>
-        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+        <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
            <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
            <unit id="org.eclipse.lsp4j" version="0.0.0"/>
+           <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
         </location>
-	    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
+	    <location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		    <dependencies>
 			    <dependency>
-				    <groupId>org.apache.commons</groupId>
-				    <artifactId>commons-lang3</artifactId>
-				    <version>3.8.1</version>
+				    <groupId>ch.qos.logback</groupId>
+				    <artifactId>logback-core</artifactId>
+				    <version>1.4.11</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>com.google.guava</groupId>
+				    <artifactId>guava</artifactId>
+				    <version>31.1-jre</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>com.google.guava</groupId>
+				    <artifactId>guava</artifactId>
+				    <version>32.1.3-jre</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>commons-cli</groupId>
+				    <artifactId>commons-cli</artifactId>
+				    <version>1.6.0</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>jakarta.annotation</groupId>
+				    <artifactId>jakarta.annotation-api</artifactId>
+				    <version>1.3.5</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>jakarta.inject</groupId>
+				    <artifactId>jakarta.inject-api</artifactId>
+				    <version>1.0.5</version>
 				    <type>jar</type>
 			    </dependency>
 			    <dependency>
@@ -59,6 +119,30 @@
 				    <version>5.0.0</version>
 				    <type>jar</type>
 			    </dependency>
+			    <dependency>
+				    <groupId>org.apache.aries.spifly</groupId>
+				    <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+				    <version>1.3.7</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>org.apache.commons</groupId>
+				    <artifactId>commons-lang3</artifactId>
+				    <version>3.8.1</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>slf4j-api</artifactId>
+				    <version>2.0.9</version>
+				    <type>jar</type>
+			    </dependency>
+			    <dependency>
+				  <groupId>net.java.dev.jna</groupId>
+				  <artifactId>jna-platform</artifactId>
+				  <version>5.13.0</version>
+				  <type>jar</type>
+			  </dependency>
 		    </dependencies>
 	    </location>
     </locations>