Skip to content

Commit 122e569

Browse files
merksmerks
committed
Update to use Java 21 for 2025-03.
1 parent 6910525 commit 122e569

15 files changed

Lines changed: 19 additions & 20 deletions

File tree

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
def targetPlatformToJavaVersionMap = [
2-
'2025-03' : '17',
2+
'2025-03' : '21',
33
'2024-12' : '17',
44
'2024-09' : '17',
55
'2024-06' : '17',
@@ -44,7 +44,7 @@ pipeline {
4444

4545
tools {
4646
maven 'apache-maven-latest'
47-
jdk 'temurin-jdk17-latest'
47+
jdk 'temurin-jdk21-latest'
4848
}
4949

5050
environment {

‎examples/org.eclipse.emf.examples.databinding.project.ui.rcp/App.launch‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
2020
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
2121
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
22-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-11"/>
22+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-21"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
2424
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
2525
<booleanAttribute key="pde.generated.config" value="false"/>
2626
<stringAttribute key="pde.version" value="3.3"/>
2727
<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product"/>
2828
<setAttribute key="selected_target_bundles">
29-
<setEntry value="com.ibm.icu*73.1.0@default:default"/>
29+
<setEntry value="com.ibm.icu@default:default"/>
3030
<setEntry value="org.eclipse.ant.core@default:default"/>
3131
<setEntry value="org.eclipse.core.commands@default:default"/>
3232
<setEntry value="org.eclipse.core.contenttype@default:default"/>
@@ -42,7 +42,6 @@
4242
<setEntry value="org.eclipse.equinox.registry@default:default"/>
4343
<setEntry value="org.eclipse.help@default:default"/>
4444
<setEntry value="org.eclipse.jface@default:default"/>
45-
<setEntry value="org.eclipse.osgi.services@default:default"/>
4645
<setEntry value="org.eclipse.osgi@-1:true"/>
4746
<setEntry value="org.eclipse.swt@default:default"/>
4847
<setEntry value="org.eclipse.team.core@default:default"/>

‎releng/org.eclipse.emf.parent/Build EMF.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
</listAttribute>
1212
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
1313
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
14-
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--no-transfer-progress&#13;&#10;-U&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Dcommit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-Dxtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;-Dorg.eclipse.justj.p2.manager.args=&quot;-remote localhost:${system_property:user.home}/emf-updates&quot;&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dtarget-platform to one of the following valid choices.&#13;&#10;&#9;&#9;photon&#13;&#10;&#9;&#9;2018-09&#13;&#10;&#9;&#9;2018-12&#13;&#10;&#9;&#9;2019-03&#13;&#10;&#9;&#9;2019-06&#13;&#10;&#9;&#9;2019-09&#13;&#10;&#9;&#9;2019-12&#13;&#10;&#9;&#9;2020-03&#13;&#10;&#9;&#9;2020-06&#13;&#10;&#9;&#9;2020-09&#13;&#10;&#9;&#9;2020-12&#13;&#10;&#9;&#9;2021-03&#13;&#10;&#9;&#9;2021-06&#13;&#10;&#9;&#9;2021-09&#13;&#10;&#9;&#9;2021-12&#13;&#10;&#9;&#9;2022-03&#13;&#10;&#9;&#9;2022-06&#13;&#10;&#9;&#9;2022-09&#13;&#10;&#9;&#9;2022-12&#13;&#10;&#9;&#9;2023-03&#13;&#10;&#9;&#9;2023-06&#13;&#10;&#9;&#9;2023-09&#13;&#10;&#9;&#9;2023-12&#13;&#10;&#9;&#9;2024-03&#13;&#10;&#9;&#9;2024-06&#13;&#10;&#9;&#9;2024-09&#13;&#10;&#9;&#9;2024-12&#13;&#10;&#9;&#9;2025-03&#13;&#10;&#13;&#10;&#9;Change -DskipTests=false to -DskipTests=true to skip the tests.&#13;&#10;&#9;&#9;The tests take long to run!&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests.&#13;&#10;&#9;&#9;Each test will block waiting for a remote debugger to attach.&#13;&#10;&#13;&#10;&#9;Remove --offline to build online.&#13;&#10;&#9;&#9;Online takes longer but it is needed the first time you build!&#13;&#10;&#13;&#10;:-Dtarget-platform=2025-03 -DskipTests=false -DDdebugPort=8000 --offline -DjavaVersion=17}&#13;&#10;clean&#13;&#10;verify"/>
14+
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="--no-transfer-progress&#13;&#10;-U&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Dcommit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce&#13;&#10;-Dmaven.artifact.threads=16&#13;&#10;-Duser.home=${system_property:user.home}&#13;&#10;-Dxtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;-Dorg.eclipse.justj.p2.manager.args=&quot;-remote localhost:${system_property:user.home}/emf-updates&quot;&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dtarget-platform to one of the following valid choices.&#13;&#10;&#9;&#9;photon&#13;&#10;&#9;&#9;2018-09&#13;&#10;&#9;&#9;2018-12&#13;&#10;&#9;&#9;2019-03&#13;&#10;&#9;&#9;2019-06&#13;&#10;&#9;&#9;2019-09&#13;&#10;&#9;&#9;2019-12&#13;&#10;&#9;&#9;2020-03&#13;&#10;&#9;&#9;2020-06&#13;&#10;&#9;&#9;2020-09&#13;&#10;&#9;&#9;2020-12&#13;&#10;&#9;&#9;2021-03&#13;&#10;&#9;&#9;2021-06&#13;&#10;&#9;&#9;2021-09&#13;&#10;&#9;&#9;2021-12&#13;&#10;&#9;&#9;2022-03&#13;&#10;&#9;&#9;2022-06&#13;&#10;&#9;&#9;2022-09&#13;&#10;&#9;&#9;2022-12&#13;&#10;&#9;&#9;2023-03&#13;&#10;&#9;&#9;2023-06&#13;&#10;&#9;&#9;2023-09&#13;&#10;&#9;&#9;2023-12&#13;&#10;&#9;&#9;2024-03&#13;&#10;&#9;&#9;2024-06&#13;&#10;&#9;&#9;2024-09&#13;&#10;&#9;&#9;2024-12&#13;&#10;&#9;&#9;2025-03&#13;&#10;&#13;&#10;&#9;Change -DskipTests=false to -DskipTests=true to skip the tests.&#13;&#10;&#9;&#9;The tests take long to run!&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests.&#13;&#10;&#9;&#9;Each test will block waiting for a remote debugger to attach.&#13;&#10;&#13;&#10;&#9;Remove --offline to build online.&#13;&#10;&#9;&#9;Online takes longer but it is needed the first time you build!&#13;&#10;&#13;&#10;:-Dtarget-platform=2025-03 -DskipTests=false -DDdebugPort=8000 --offline -DjavaVersion=21}&#13;&#10;clean&#13;&#10;verify"/>
1515
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${emf.git.clone.location}"/>
1616
</launchConfiguration>

‎releng/org.eclipse.emf.site/Runtime Workspace.launch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
33
<setAttribute key="additional_plugins">
4-
<setEntry value="com.ibm.icu:74.2.0:default:true:default:default"/>
4+
<setEntry value="com.ibm.icu:76.1.0:default:true:default:default"/>
55
<setEntry value="jakarta.inject.jakarta.inject-api:2.0.1:default:true:default:default"/>
66
<setEntry value="org.aopalliance:1.0.0.v20230720-0728:default:true:default:default"/>
7-
<setEntry value="org.objectweb.asm:9.6.0:default:true:default:default"/>
7+
<setEntry value="org.objectweb.asm:9.7.1:default:true:default:default"/>
88
</setAttribute>
99
<booleanAttribute key="append.args" value="true"/>
1010
<booleanAttribute key="askclear" value="true"/>
@@ -29,7 +29,7 @@
2929
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3030
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
3131
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
32-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
32+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3333
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
3434
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
3535
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.emf.examples.generator.validator=false&#13;&#10;-Dxswt.autoScale=225&#13;&#10;-Xmx8g"/>

‎tests/org.eclipse.emf.test.codegen.ecore.xtext/Test EMF Xtext.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
1919
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
2020
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
21-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
21+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.test.codegen.ecore.xtext.GenModelResourceDescriptionManagerTest"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.codegen.ecore.xtext"/>
2424
</launchConfiguration>

‎tests/org.eclipse.emf.test.core/Test EMF Core.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
3232
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3333
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
34-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
34+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3535
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.test.core.AllSuites"/>
3636
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog"/>
3737
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.core"/>

‎tests/org.eclipse.emf.test.databinding.edit/Test EMF Databinding Edit.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
3232
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3333
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
34-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
34+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3535
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.test.databinding.edit.EMFEditPropertiesTest"/>
3636
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog"/>
3737
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.databinding.edit"/>

‎tests/org.eclipse.emf.test.databinding/Test EMF Databinding.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3333
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
3434
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
35-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
35+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3636
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.test.databinding.EMFPropertiesTest"/>
3737
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-consolelog"/>
3838
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.databinding"/>

‎tests/org.eclipse.emf.test.ecore.xcore/Test EMF Xcore.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
2020
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
2121
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
22-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
22+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21/"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
2424
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.ecore.xcore"/>
2525
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx700m"/>

‎tests/org.eclipse.emf.test.edit.ui.platform/Test EMF Edit UI Platform.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
3232
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
3333
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
34-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
34+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3535
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.test.edit.ui.platform.AllSuites"/>
3636
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
3737
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.test.edit.ui.platform"/>

0 commit comments

Comments
 (0)