fixup of integration test

gretty-gradle-plugin · May 28, 2024 · 2a9fe2d · 2a9fe2d
1 parent 7f36888
commit 2a9fe2d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,14 +49,19 @@ jobs:
             gradle: '6.9.4'
             container: "['jetty9.3','jetty9.4','tomcat85','tomcat9']"
 
+          - java: 8
+            gradle: '6.9.4'
+            container: "['jetty9.3','jetty9.4','tomcat85','tomcat9']"
+            toolchainJavaVersion: 21
+
           - java: 11
             gradle: '6.9.4'
             container: "['jetty9.3','jetty9.4','jetty10','tomcat85','tomcat9']"
 
           - java: 11
             gradle: '6.9.4'
             container: "['jetty9.3','jetty9.4','jetty10','tomcat85','tomcat9']"
-            toolchainJavaVersion: 17
+            toolchainJavaVersion: 21
 
           - java: 17
             gradle: '7.6.4'

diff --git a/docker_integration_tests.sh b/docker_integration_tests.sh
@@ -30,7 +30,6 @@ export common_gradle_args="--console=plain --no-daemon -Porg.gradle.java.install
   $common_gradle_args               \
   -PtestAllContainers="\"['jetty9.3','jetty9.4','jetty10','tomcat85','tomcat9']\"" \
   testAll
-#
 
 #ci.yml matrix case #3
 ./docker_gradlew.sh                 \
@@ -42,6 +41,17 @@ export common_gradle_args="--console=plain --no-daemon -Porg.gradle.java.install
   -PtestAllContainers="\"['jetty9.3','jetty9.4','jetty10','tomcat85','tomcat9']\"" \
   -Pspock_version=2.3-groovy-3.0 -PgebVersion=5.1 \
   testAll
+
+#ci.yml matrix case #1 + toolchain java v21
+./docker_gradlew.sh                 \
+  --java 21 --java 8                \
+  --gradle 6                        \
+  --gradle-home .docker-gradle      \
+  --working-dir integrationTests    \
+  $common_gradle_args               \
+  -PtestAllContainers="\"['jetty9.3','jetty9.4','tomcat85','tomcat9']\"" \
+  -PtoolchainJavaVersion=21         \
+  testAllJavaToolchain
 
 #ci.yml matrix case #2 + toolchain java v17
 ./docker_gradlew.sh                 \

diff --git a/...n/src/integrationTest/groovy/org/akhikhl/examples/gretty/gradle/toolchain/PageSpec.groovy b/...n/src/integrationTest/groovy/org/akhikhl/examples/gretty/gradle/toolchain/PageSpec.groovy
@@ -18,6 +18,7 @@ class PageSpec extends GebReportingSpec {
   void setupSpec() {
     baseURI = System.getProperty('gretty.baseURI')
     toolchainJavaVersion = Objects.requireNonNull(System.getProperty('toolchainJavaVersion'))
+            ?.with({ it == '8' ? '1.8' : it })
   }
 
   def 'should get expected static page'() {

diff --git a/...-toolchain/src/main/java/org/akhikhl/examples/gretty/gradle/toolchain/ExampleServlet.java b/...-toolchain/src/main/java/org/akhikhl/examples/gretty/gradle/toolchain/ExampleServlet.java
@@ -33,7 +33,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
     VelocityContext context = new VelocityContext();
     context.put("contextPath", request.getContextPath());
     context.put("today", new java.util.Date());
-    context.put("javaVersion", System.getProperty("java.vm.version"));
+    context.put("javaVersion", System.getProperty("java.specification.version"));
     PrintWriter out = response.getWriter();
     try {
       template.merge(context, out);