Skip to content

Commit d7e2115

Browse files
committed
refact: upgrade to Java 21 and require Eclipse 2024-06+
1 parent 8e7562e commit d7e2115

File tree

51 files changed

+109
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+109
-112
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,18 @@ jobs:
129129
sudo apt-get install --no-install-recommends -y xdg-utils
130130
131131
132-
- name: "Install: JDK 17 for Compilation ☕"
132+
- name: "Install: JDK 21 for Compilation ☕"
133133
uses: actions/setup-java@v5 # https://github.com/actions/setup-java
134134
with:
135135
distribution: temurin
136-
java-version: 17
136+
java-version: 21
137137

138138

139-
- name: "Install: JDK 21 for Maven/Tycho ☕"
139+
- name: "Install: JDK 25 for Maven/Tycho ☕"
140140
uses: actions/setup-java@v5 # https://github.com/actions/setup-java
141141
with:
142142
distribution: temurin
143-
java-version: 21
143+
java-version: 25
144144

145145

146146
- name: "Cache: Local Maven Repository"

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ pipeline {
2929
stage('Setup Maven Toolchains') {
3030
steps {
3131
script { try {
32-
def jdk17 = tool name: 'temurin-jdk17-latest', type: 'jdk'
32+
def jdk21 = tool name: 'temurin-jdk21-latest', type: 'jdk'
3333

3434
// Generate toolchains.xml for Maven Toolchains plugin
3535
writeFile file: "/tmp/toolchains.xml", text: """
3636
<toolchains>
3737
<toolchain>
3838
<type>jdk</type>
3939
<provides>
40-
<version>17</version>
40+
<version>21</version>
4141
<vendor>temurin</vendor>
4242
</provides>
4343
<configuration>
44-
<jdkHome>${jdk17}</jdkHome>
44+
<jdkHome>${jdk21}</jdkHome>
4545
</configuration>
4646
</toolchain>
4747
</toolchains>

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ The latest snapshot build can be installed from the update site [https://downloa
2222

2323
TM4E version | Min. Eclipse version
2424
-------------|--------------------
25-
[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
26-
[0.9.0](https://download.eclipse.org/tm4e/releases/0.9/)+ | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
27-
[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+ | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0))
28-
[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+ | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0))
29-
[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+ | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0))
30-
[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+ | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0))
31-
[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+ | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0))
25+
[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0))
26+
[0.16.0](https://download.eclipse.org/tm4e/releases/0.16.0/)+ | [2024-06](https://projects.eclipse.org/releases/2024-06) ([4.32](https://projects.eclipse.org/projects/eclipse/releases/4.32.0))
27+
[0.9.0](https://download.eclipse.org/tm4e/releases/0.9.0/)+ | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0))
28+
[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+ | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0))
29+
[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+ | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0))
30+
[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+ | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0))
31+
[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+ | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0))
32+
[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+ | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0))
3233

3334

3435
### 2) as a Java API with Maven

org.eclipse.tm4e.core.tests/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
44
<attributes>
55
<attribute name="module" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>

org.eclipse.tm4e.core.tests/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1111
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
1212
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1313
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
14-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
14+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1515
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
16-
org.eclipse.jdt.core.compiler.compliance=17
16+
org.eclipse.jdt.core.compiler.compliance=21
1717
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1818
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1919
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -129,7 +129,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
129129
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
130130
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
131131
org.eclipse.jdt.core.compiler.release=enabled
132-
org.eclipse.jdt.core.compiler.source=17
132+
org.eclipse.jdt.core.compiler.source=21
133133
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
134134
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
135135
org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false

org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true
7-
Bundle-Version: 0.15.2.qualifier
7+
Bundle-Version: 0.16.0.qualifier
88
Require-Bundle: org.apache.batik.css,
99
org.apache.batik.util,
1010
com.google.gson,
@@ -15,6 +15,6 @@ Import-Package: org.junit.jupiter.api,
1515
org.junit.jupiter.api.function,
1616
org.w3c.css.sac,
1717
org.w3c.css.sac.helpers
18-
Bundle-RequiredExecutionEnvironment: JavaSE-17
18+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1919
Bundle-ActivationPolicy: lazy
2020
Automatic-Module-Name: org.eclipse.tm4e.core.tests

org.eclipse.tm4e.core.tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.eclipse</groupId>
77
<artifactId>org.eclipse.tm4e</artifactId>
8-
<version>0.15.2-SNAPSHOT</version>
8+
<version>0.16.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>org.eclipse.tm4e.core.tests</artifactId>

org.eclipse.tm4e.core/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
44
<attributes>
55
<attribute name="maven.pomderived" value="true"/>
66
</attributes>

org.eclipse.tm4e.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin
1414
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
1515
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1616
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
17-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
17+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
1818
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
19-
org.eclipse.jdt.core.compiler.compliance=17
19+
org.eclipse.jdt.core.compiler.compliance=21
2020
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2121
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2222
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
134134
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
135135
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
136136
org.eclipse.jdt.core.compiler.release=enabled
137-
org.eclipse.jdt.core.compiler.source=17
137+
org.eclipse.jdt.core.compiler.source=21
138138
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
139139
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
140140
org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false

org.eclipse.tm4e.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
44
Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: org.eclipse.tm4e.core
7-
Bundle-Version: 0.15.2.qualifier
7+
Bundle-Version: 0.16.0.qualifier
88
Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)",
99
org.apache.batik.css;bundle-version="[1.19.0,2.0.0)",
1010
org.apache.batik.util;bundle-version="[1.19.0,2.0.0)",
@@ -14,7 +14,7 @@ Require-Bundle: com.google.gson;bundle-version="[2.13.1,3.0.0)",
1414
Import-Package: org.w3c.css.sac,
1515
org.w3c.css.sac.helpers,
1616
org.w3c.dom.css
17-
Bundle-RequiredExecutionEnvironment: JavaSE-17
17+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1818
Export-Package: org.eclipse.tm4e.core,
1919
org.eclipse.tm4e.core.grammar,
2020
org.eclipse.tm4e.core.internal.grammar;x-friends:="org.eclipse.tm4e.core.tests,org.eclipse.tm4e.ui",

0 commit comments

Comments
 (0)