@@ -19,14 +19,16 @@ data class ImageTarget(
19
19
val extraTag = findProperty(" extraTag" )
20
20
? : java.time.format.DateTimeFormatter .ofPattern(" yyyyMMdd.HHmmSS" ).format(java.time.LocalDateTime .now())
21
21
22
+ val latestJava = " 23" // renovate: datasource=java-version
23
+
22
24
// Each line under appserver describes one matrix of (version x vm x jdk), dockerfile key overrides
23
25
// Dockerfile name, args key passes raw arguments to docker build
24
26
val targets = mapOf (
25
27
" 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" ),
30
32
),
31
33
" liberty" to listOf (
32
34
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(
40
42
ImageTarget (listOf (" 5.2020.6" , " 5.2021.8" ), listOf (" hotspot" , " openj9" ), listOf (" 8" , " 11" )),
41
43
// Test application is not deployed when server is sarted with hotspot jdk version 21
42
44
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" )
44
46
),
45
47
" tomcat" to listOf (
46
48
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" ),
50
52
),
51
53
" tomee" to listOf (
52
54
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" ),
55
57
),
56
58
" websphere" to listOf (
57
59
ImageTarget (listOf (" 8.5.5.22" , " 9.0.5.14" ), listOf (" openj9" ), listOf (" 8" ), windows = false ),
@@ -61,12 +63,12 @@ val targets = mapOf(
61
63
ImageTarget (
62
64
listOf (" 17.0.1.Final" , " 21.0.0.Final" ),
63
65
listOf (" hotspot" , " openj9" ),
64
- listOf (" 8" , " 11" , " 17" , " 21" , " 23 " )
66
+ listOf (" 8" , " 11" , " 17" , " 21" , latestJava )
65
67
),
66
68
ImageTarget (
67
69
listOf (" 28.0.1.Final" , " 29.0.1.Final" , " 30.0.1.Final" ),
68
70
listOf (" hotspot" , " openj9" ),
69
- listOf (" 11" , " 17" , " 21" , " 23 " ),
71
+ listOf (" 11" , " 17" , " 21" , latestJava ),
70
72
war = " servlet-5.0"
71
73
),
72
74
),
0 commit comments