From 6819141151f5a6962463515a6720ff020c1e328a 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: Wed, 10 Jul 2024 13:41:06 +0300
Subject: [PATCH] Run tests on Java 23

---
 org.eclipse.jdt.core.tests.javac/.classpath   |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++---
 .../META-INF/MANIFEST.MF                      |  2 +-
 org.eclipse.jdt.core.tests.javac/pom.xml      |  4 ++--
 org.eclipse.jdt.core.tests.model/pom.xml      | 21 +++++++++++++++++++
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/org.eclipse.jdt.core.tests.javac/.classpath b/org.eclipse.jdt.core.tests.javac/.classpath
index 374789ea86a..65b829b170e 100644
--- a/org.eclipse.jdt.core.tests.javac/.classpath
+++ b/org.eclipse.jdt.core.tests.javac/.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-22">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-23">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/org.eclipse.jdt.core.tests.javac/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.core.tests.javac/.settings/org.eclipse.jdt.core.prefs
index 12785659507..f23daeba401 100644
--- a/org.eclipse.jdt.core.tests.javac/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.core.tests.javac/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=22
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=23
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=22
+org.eclipse.jdt.core.compiler.compliance=23
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -137,6 +137,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=22
+org.eclipse.jdt.core.compiler.source=23
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.core.tests.javac/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.javac/META-INF/MANIFEST.MF
index d62fa92cd99..6ddb6281dd8 100644
--- a/org.eclipse.jdt.core.tests.javac/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.javac/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.eclipse.jdt.core.tests.model,
  org.eclipse.jdt.core.compiler.batch
-Bundle-RequiredExecutionEnvironment: JavaSE-22
+Bundle-RequiredExecutionEnvironment: JavaSE-23
 Eclipse-BundleShape: dir
 Bundle-Activator: org.eclipse.jdt.core.tests.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jdt.core.tests.javac/pom.xml b/org.eclipse.jdt.core.tests.javac/pom.xml
index de7e0c6fc7d..f797ac2d6cb 100644
--- a/org.eclipse.jdt.core.tests.javac/pom.xml
+++ b/org.eclipse.jdt.core.tests.javac/pom.xml
@@ -23,7 +23,7 @@
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
 		<profile>
-			<id>test-on-javase-22</id>
+			<id>test-on-javase-23</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -32,7 +32,7 @@
 						<configuration>
 							<toolchains>
 								<jdk>
-									<id>JavaSE-22</id>
+									<id>JavaSE-23</id>
 								</jdk>
 							</toolchains>
 						</configuration>
diff --git a/org.eclipse.jdt.core.tests.model/pom.xml b/org.eclipse.jdt.core.tests.model/pom.xml
index 30ecbbd2767..ee4a3c3ccbb 100644
--- a/org.eclipse.jdt.core.tests.model/pom.xml
+++ b/org.eclipse.jdt.core.tests.model/pom.xml
@@ -177,6 +177,27 @@
 			<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,22</tycho.surefire.argLine>
 		</properties>
 	</profile>
+	<profile>
+		<id>test-on-javase-23</id>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-toolchains-plugin</artifactId>
+					<configuration>
+						<toolchains>
+							<jdk>
+								<id>JavaSE-23</id>
+							</jdk>
+						</toolchains>
+					</configuration>
+				</plugin>
+			</plugins>
+		</build>
+		<properties>
+			<tycho.surefire.argLine>--add-modules ALL-SYSTEM -Dcompliance=1.8,17,21,23</tycho.surefire.argLine>
+		</properties>
+	</profile>
   </profiles>
 
 </project>