Skip to content

Commit a3b6805

Browse files
committed
[GR-45370] JDK 21 is LTS, remove JDK 17
1 parent d96bd36 commit a3b6805

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

ci.jsonnet

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://github.com/google/jsonnet/releases and compiled.
1111

1212
# CONFIGURATION
13-
local overlay = "8fcbcd2506181e6bd020d113940b41897bd4a528";
13+
local overlay = "1a47807cf46687114e0423fff01a2103ae8bd727";
1414

1515
# For debugging: generated builds will be restricted to those listed in
1616
# the array. No restriction is applied when it is empty.
@@ -219,19 +219,13 @@ local part_definitions = {
219219
jdk: {
220220
local with_path = { environment+: { path+:: ["$JAVA_HOME/bin"] } },
221221

222-
local v17 = with_path + common.jdks["labsjdk-ce-17"] + {
223-
environment+: {
224-
JT_JDK: "17",
225-
},
226-
},
227-
228222
local v21 = with_path + common.jdks["labsjdk-ce-21"] + {
229223
environment+: {
230224
JT_JDK: "21",
231225
},
232226
},
233227

234-
lts: v17 + { jdk_label:: 'lts' },
228+
lts: v21 + { jdk_label:: 'lts' },
235229
new: v21 + { jdk_label:: 'new' },
236230
},
237231

tool/jt.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# Expand GEM_HOME relative to cwd so it cannot be misinterpreted later.
6565
ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']
6666

67-
JDK_VERSIONS = [17, 21]
67+
JDK_VERSIONS = [21]
6868
DEFAULT_JDK_VERSION = JDK_VERSIONS.first
6969

7070
MRI_TEST_RELATIVE_PREFIX = 'test/mri/tests'

0 commit comments

Comments
 (0)