Update Java version to 21

to fix the build errors
ghentschke · Apr 19, 2024 · df20f14 · df20f14
1 parent 96a3310
commit df20f14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -21,10 +21,10 @@ jobs:
             - 'dsf/**'
             - 'debug/**'
             - 'jtag/**'
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven

diff --git a/.github/workflows/code-cleanliness.yml b/.github/workflows/code-cleanliness.yml
@@ -11,10 +11,10 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Set up Maven

diff --git a/pom.xml b/pom.xml
@@ -644,7 +644,7 @@
 								<version>${required-maven-version}</version>
 							</requireMavenVersion>
 							<requireJavaVersion>
-								<version>17</version>
+								<version>21</version>
 							</requireJavaVersion>
 						</rules>
 						<fail>true</fail>
@@ -1019,7 +1019,7 @@
 							</goals>
 							<phase>compile</phase>
 							<configuration>
-								<executionEnvironment>JavaSE-17</executionEnvironment>
+								<executionEnvironment>JavaSE-21</executionEnvironment>
 							</configuration>
 						</execution>
 					</executions>

diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="156">
+<target name="cdt" sequenceNumber="157">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/" />
@@ -205,7 +205,7 @@
 			<unit id="org.apache.commons.logging" version="0.0.0"/>
 		</location>
 	</locations>
-	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17" />
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21" />
 	<launcherArgs>
 		<vmArgs>-Xms40m&#13;
 		-Xmx512M&#13;