Add smoke test image for jetty12 (#10553)

Author: laurit

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

@@ -27,7 +27,7 @@ val targets = mapOf(
     ImageTarget(listOf("9.4.53"), listOf("hotspot", "openj9"), listOf("8", "11", "17", "21"), mapOf("sourceVersion" to "9.4.53.v20231009")),
     ImageTarget(listOf("10.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("sourceVersion" to "10.0.19")),
     ImageTarget(listOf("11.0.19"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("sourceVersion" to "11.0.19"), "servlet-5.0"),
-//    ImageTarget(listOf("12.0.5"), listOf("hotspot", "openj9"), listOf("11", "17", "21"), mapOf("sourceVersion" to "12.0.5")), //enable once Jetty 12 is supported
+    ImageTarget(listOf("12.0.6"), listOf("hotspot"), listOf("17"), mapOf("sourceVersion" to "12.0.6"), "servlet-5.0"),
   ),
   "liberty" to listOf(
     ImageTarget(listOf("20.0.0.12"), listOf("hotspot", "openj9"), listOf("8", "11"), mapOf("release" to "2020-11-11_0736")),

smoke-tests/images/servlet/src/jetty.dockerfile

@@ -15,6 +15,7 @@ RUN mkdir $JETTY_BASE && \
   cd $JETTY_BASE && \
   # depending on Jetty version one of the following commands should succeed
   java -jar /server/start.jar --add-module=ext,server,jsp,resources,deploy,jstl,websocket,http || \
+  java -jar /server/start.jar --add-module=ext,server,ee10-jsp,resources,ee10-deploy,ee10-jstl,http || \
   java -jar /server/start.jar --add-to-start=ext,server,jsp,resources,deploy,jstl,websocket,http
 
 WORKDIR $JETTY_BASE

smoke-tests/images/servlet/src/jetty.windows.dockerfile

@@ -18,7 +18,8 @@ ENV JETTY_BASE=/base
 WORKDIR $JETTY_BASE
 # depending on Jetty version one of the following commands should succeed
 RUN java -jar /server/start.jar --add-module=ext,server,jsp,resources,deploy,jstl,websocket,http; \
-    if ($LASTEXITCODE -ne 0) { java -jar /server/start.jar --add-to-start=ext,server,jsp,resources,deploy,jstl,websocket,http }
+    if ($LASTEXITCODE -ne 0) { java -jar /server/start.jar --add-module=ext,server,ee10-jsp,resources,ee10-deploy,ee10-jstl,http; \
+    if ($LASTEXITCODE -ne 0) { java -jar /server/start.jar --add-to-start=ext,server,jsp,resources,deploy,jstl,websocket,http }}
 
 CMD java -jar /server/start.jar