Skip to content

Commit 9a90390

Browse files
authored
GH-1503: update everything to Java 21
* Switch to JDT LS 1.45 and Java 21 * Java 21 for LS side * Switch to Java 21 the branding plugin --------- Signed-off-by: Martin Lippert <[email protected]> Co-authored-by: Alex Boyko <[email protected]>
1 parent cd3bbb9 commit 9a90390

File tree

90 files changed

+98
-96
lines changed

Some content is hidden

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

90 files changed

+98
-96
lines changed

.github/workflows/eclipse-ls-extensions-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ jobs:
108108
urls: ${{ steps.compute-invalid-urls.outputs.invalid_urls }}
109109
cloudflare_zone_id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
110110
cloudflare_cache_token: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }}
111-
- name: Verify Eclipse LS Extensions on e435
111+
- name: Verify Eclipse LS Extensions on e436
112112
if: ${{ inputs.build_type == 'snapshot' }}
113113
run: |
114114
cd eclipse-language-servers
115115
if command -v xvfb-run ; then
116-
xvfb-run ./mvnw --batch-mode clean package -Pe435 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
116+
xvfb-run ./mvnw --batch-mode clean package -Pe436 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
117117
else
118-
./mvnw --batch-mode clean package -Pe435 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
118+
./mvnw --batch-mode clean package -Pe436 -P${{ inputs.build_type }} -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dmaven.test.skip=true -Dtycho.localArtifacts=ignore
119119
fi
120120
- name: GChat spring-tools-team notification
121121
if: ${{ inputs.build_type == 'release' }}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
./mvnw clean install -Pe436 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5
1+
./mvnw clean install -Pe434 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5
22

eclipse-distribution/org.springframework.boot.ide.branding/.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
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="target/classes"/>

eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
99
org.eclipse.equinox.p2.ui.sdk,
1010
org.springsource.ide.eclipse.commons.core,
1111
org.eclipse.equinox.p2.engine
12-
Bundle-RequiredExecutionEnvironment: JavaSE-17
12+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1313
Bundle-Localization: plugin
1414
Bundle-ActivationPolicy: lazy
1515
Import-Package: org.eclipse.core.runtime,

eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/.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-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="target/classes"/>

eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Live Beans Tree
44
Bundle-SymbolicName: org.springframework.ide.eclipse.beans.ui.live;singleton:=true
55
Bundle-Version: 4.30.0.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-17
6+
Bundle-RequiredExecutionEnvironment: JavaSE-21
77
Export-Package: org.springframework.ide.eclipse.beans.ui.live,
88
org.springframework.ide.eclipse.beans.ui.live.actions,
99
org.springframework.ide.eclipse.beans.ui.live.model,

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/.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-1.8">
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
</attributes>

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.azure/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Import-Package: com.google.gson,
2020
com.google.gson.annotations,
2121
com.google.gson.reflect,
2222
com.google.gson.stream
23-
Bundle-RequiredExecutionEnvironment: JavaSE-17
23+
Bundle-RequiredExecutionEnvironment: JavaSE-21
2424
Bundle-Activator: org.springframework.ide.eclipse.boot.dash.azure.BootDashAzurePlugin
2525
Bundle-ActivationPolicy: lazy
2626
Export-Package: org.springframework.ide.eclipse.boot.dash.azure

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/.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-1.8"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry kind="output" path="target/classes"/>

eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: org.springframework.ide.eclipse.boot.dash.docker
44
Bundle-SymbolicName: org.springframework.ide.eclipse.boot.dash.docker;singleton:=true
55
Bundle-Version: 4.30.0.qualifier
66
Automatic-Module-Name: org.springframework.ide.eclipse.boot.dash.docker
7-
Bundle-RequiredExecutionEnvironment: JavaSE-17
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.springframework.ide.eclipse.boot.dash,
99
org.springframework.ide.eclipse.boot,
1010
org.springsource.ide.eclipse.commons.livexp,

0 commit comments

Comments
 (0)