Skip to content

Commit a603b8a

Browse files
authored
More latest Java via Renovate (#14943)
1 parent 7ea4ed6 commit a603b8a

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

.github/renovate.json5

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,12 @@
351351
customType: 'regex',
352352
datasourceTemplate: 'java-version',
353353
managerFilePatterns: [
354-
'.github/workflows/**'
354+
'.github/workflows/**',
355+
'**/*.gradle.kts'
355356
],
356357
matchStrings: [
357358
'(?<currentValue>\\d+) # renovate: datasource=java-version',
359+
'"(?<currentValue>\\d+)" // renovate: datasource=java-version',
358360
],
359361
depNameTemplate: 'java',
360362
extractVersionTemplate: '^(?<version>\\d+)',

smoke-tests/images/servlet/build.gradle.kts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ data class ImageTarget(
1919
val extraTag = findProperty("extraTag")
2020
?: java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(java.time.LocalDateTime.now())
2121

22+
val latestJava = "23" // renovate: datasource=java-version
23+
2224
// Each line under appserver describes one matrix of (version x vm x jdk), dockerfile key overrides
2325
// Dockerfile name, args key passes raw arguments to docker build
2426
val targets = mapOf(
2527
"jetty" to listOf(
26-
ImageTarget(listOf("9.4.53"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("sourceVersion" to "9.4.53.v20231009")),
27-
ImageTarget(listOf("10.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("sourceVersion" to "10.0.19")),
28-
ImageTarget(listOf("11.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("sourceVersion" to "11.0.19"), "servlet-5.0"),
29-
ImageTarget(listOf("12.0.6"), listOf("hotspot", "openj9"), listOf("17", "21", "23"), mapOf("sourceVersion" to "12.0.6"), "servlet-5.0"),
28+
ImageTarget(listOf("9.4.53"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", latestJava), mapOf("sourceVersion" to "9.4.53.v20231009")),
29+
ImageTarget(listOf("10.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", latestJava), mapOf("sourceVersion" to "10.0.19")),
30+
ImageTarget(listOf("11.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21", latestJava), mapOf("sourceVersion" to "11.0.19"), "servlet-5.0"),
31+
ImageTarget(listOf("12.0.6"), listOf("hotspot", "openj9"), listOf("17", "21", latestJava), mapOf("sourceVersion" to "12.0.6"), "servlet-5.0"),
3032
),
3133
"liberty" to listOf(
3234
ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")),
@@ -40,18 +42,18 @@ val targets = mapOf(
4042
ImageTarget(listOf("5.2020.6", "5.2021.8"), listOf("hotspot", "openj9"), listOf("8", "11")),
4143
// Test application is not deployed when server is sarted with hotspot jdk version 21
4244
ImageTarget(listOf("6.2023.12"), listOf("hotspot"), listOf("11", "17"), war = "servlet-5.0"),
43-
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21", "23"), war = "servlet-5.0")
45+
ImageTarget(listOf("6.2023.12"), listOf("openj9"), listOf("11", "17", "21", latestJava), war = "servlet-5.0")
4446
),
4547
"tomcat" to listOf(
4648
ImageTarget(listOf("7.0.109"), listOf("hotspot", "openj9"), listOf("8"), mapOf("majorVersion" to "7")),
47-
ImageTarget(listOf("8.5.98"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("majorVersion" to "8")),
48-
ImageTarget(listOf("9.0.85"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23"), mapOf("majorVersion" to "9")),
49-
ImageTarget(listOf("10.1.18"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), mapOf("majorVersion" to "10"), "servlet-5.0"),
49+
ImageTarget(listOf("8.5.98"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", latestJava), mapOf("majorVersion" to "8")),
50+
ImageTarget(listOf("9.0.85"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", latestJava), mapOf("majorVersion" to "9")),
51+
ImageTarget(listOf("10.1.18"), listOf("hotspot", "openj9"), listOf("11", "17", "21", latestJava), mapOf("majorVersion" to "10"), "servlet-5.0"),
5052
),
5153
"tomee" to listOf(
5254
ImageTarget(listOf("7.0.9", "7.1.4"), listOf("hotspot", "openj9"), listOf("8")),
53-
ImageTarget(listOf("8.0.16"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", "23")),
54-
ImageTarget(listOf("9.1.2"), listOf("hotspot", "openj9"), listOf("11", "17", "21", "23"), war = "servlet-5.0"),
55+
ImageTarget(listOf("8.0.16"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21", latestJava)),
56+
ImageTarget(listOf("9.1.2"), listOf("hotspot", "openj9"), listOf("11", "17", "21", latestJava), war = "servlet-5.0"),
5557
),
5658
"websphere" to listOf(
5759
ImageTarget(listOf("8.5.5.22", "9.0.5.14"), listOf("openj9"), listOf("8"), windows = false),
@@ -61,12 +63,12 @@ val targets = mapOf(
6163
ImageTarget(
6264
listOf("17.0.1.Final", "21.0.0.Final"),
6365
listOf("hotspot", "openj9"),
64-
listOf("8", "11", "17", "21", "23")
66+
listOf("8", "11", "17", "21", latestJava)
6567
),
6668
ImageTarget(
6769
listOf("28.0.1.Final", "29.0.1.Final", "30.0.1.Final"),
6870
listOf("hotspot", "openj9"),
69-
listOf("11", "17", "21", "23"),
71+
listOf("11", "17", "21", latestJava),
7072
war = "servlet-5.0"
7173
),
7274
),

0 commit comments

Comments
 (0)