From ff3257392cb67c099160391f1cd6af2b4e95f11c Mon Sep 17 00:00:00 2001
From: Fred Bricon <fbricon@gmail.com>
Date: Mon, 27 May 2024 11:48:21 +0200
Subject: [PATCH] Run tests against javac bits

Signed-off-by: Fred Bricon <fbricon@gmail.com>
---
 .../org.eclipse.jdt.ls.tp.target              |  3 +-
 org.eclipse.jdt.ls.tests/.classpath           |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +--
 org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF |  6 ++-
 org.eclipse.jdt.ls.tests/pom.xml              | 11 +++++
 pom.xml                                       | 47 +++++++++++++++++++
 6 files changed, 68 insertions(+), 7 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 3b8538c740..e8a23c8e05 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
@@ -32,8 +32,9 @@
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" 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.core.javac" 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/"/>
+            <repository location="https://ci.eclipse.org/ls/job/jdt-core-incubator/job/dom-with-javac/lastSuccessfulBuild/artifact/repository/target/repository/"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
             <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
diff --git a/org.eclipse.jdt.ls.tests/.classpath b/org.eclipse.jdt.ls.tests/.classpath
index 7f87f1ffe7..1a4e198f5d 100644
--- a/org.eclipse.jdt.ls.tests/.classpath
+++ b/org.eclipse.jdt.ls.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-22"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/">
 		<attributes>
diff --git a/org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs
index ba153f0a08..f3238111ab 100644
--- a/org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=22
+org.eclipse.jdt.core.compiler.compliance=22
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 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=22
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF
index ba82bb8c2c..626f644b25 100644
--- a/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF
@@ -5,8 +5,10 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jdt.ls.tests;singleton:=true
 Bundle-Version: 1.40.0.qualifier
 Export-Package: org.eclipse.jdt.ls.core.internal;x-friends:="org.eclipse.jdt.ls.tests.syntaxserver"
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Import-Package: org.osgi.framework;version="1.3.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-22
+Import-Package: org.osgi.framework;version="1.3.0",
+ org.eclipse.jdt.internal.javac,
+ org.eclipse.jdt.internal.javac.dom
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.jdt.ls.core,
diff --git a/org.eclipse.jdt.ls.tests/pom.xml b/org.eclipse.jdt.ls.tests/pom.xml
index e2902c1f9a..8cb5a2822d 100644
--- a/org.eclipse.jdt.ls.tests/pom.xml
+++ b/org.eclipse.jdt.ls.tests/pom.xml
@@ -58,6 +58,17 @@
 							</artifactItems>
 						</configuration>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-toolchains-plugin</artifactId>
+						<configuration>
+							<toolchains>
+								<jdk>
+									<id>JavaSE-22</id>
+								</jdk>
+							</toolchains>
+						</configuration>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/pom.xml b/pom.xml
index 5ab75d292d..a268ae9f2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,8 @@
 		<!-- skip for local builds, set it to true on Eclipse.org infrastructure -->
 		<cbi.jarsigner.skip>true</cbi.jarsigner.skip>
 		<generateSourceRef>true</generateSourceRef>
+		<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
+		<cbi-ecj-version>3.38.0.v20240524-2033</cbi-ecj-version>
 	</properties>
 	<modules>
 		<module>org.eclipse.jdt.ls.target</module>
@@ -187,6 +189,35 @@
 						</dependency-resolution>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-compiler-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.eclipse.jdt</groupId>
+							<artifactId>ecj</artifactId>
+							<version>${cbi-ecj-version}</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<compilerArgs>
+							<args>-verbose</args>
+							<args>-inlineJSR</args>
+							<args>-enableJavadoc</args>
+							<args>-encoding</args>
+							<args>${project.build.sourceEncoding}</args>
+							<args>-proceedOnError</args>
+						</compilerArgs>
+						<log>xml</log>
+						<logDirectory>${compileLogDir}</logDirectory>
+						<showWarnings>true</showWarnings>
+						<excludeResources>
+							<exclude>**/package.html</exclude>
+						</excludeResources>
+						<useProjectSettings>true</useProjectSettings>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -315,12 +346,28 @@
 				<generateSourceRef>false</generateSourceRef>
 			</properties>
 		</profile>
+		<profile>
+			<id>javac</id>
+			<properties>
+				<tycho.testArgLine>--add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -DICompilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver -DCompilationUnit.DOM_BASED_OPERATIONS=true -DAbstractImageBuilder.compiler=org.eclipse.jdt.internal.javac.JavacCompiler</tycho.testArgLine>
+			</properties>
+		</profile>
 	</profiles>
 	<pluginRepositories>
 		<pluginRepository>
 			<id>cbi-release</id>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
+		<pluginRepository>
+			<id>cbi-jdt</id>
+			<url>${cbi-jdt-repo.url}</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
 	</pluginRepositories>
 	<distributionManagement>
 		<repository>