Merge pull request #422 from KyleAure/solidify-java-17-and-21

TCK allow certification against Java 17 and 21
jakartaee · Jan 16, 2024 · c814d49 · c814d49
2 parents 6abfdc7 + 03a4016
commit c814d49
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
     # TODO update once 25-ea is available
     strategy:
       matrix:
-        java-version: [ '21' ]
+        java-version: [ '17', '21' ]
 
     runs-on: ubuntu-latest
 

diff --git a/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc b/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc
@@ -16,8 +16,8 @@
 :TCKTestPlatform: JUnit5
 :SigPluginGAV: org.netbeans.tools:sigtest-maven-plugin:1.6
 
-:JavaVersion1: 21
-:JavaVersion2: 17
+:JavaVersion1: 17
+:JavaVersion2: 21
 
 :TCKProcess: 1.3
 :TCKProcessDoc: https://jakarta.ee/committees/specification/tckprocess

diff --git a/tck-dist/src/main/starter/ee-pom.xml b/tck-dist/src/main/starter/ee-pom.xml
@@ -29,7 +29,6 @@
   <!-- General properties -->
   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-  <!-- TODO might need to update to 21 for Jakarta 11 -->
   <maven.compiler.source>17</maven.compiler.source>
   <maven.compiler.target>17</maven.compiler.target>
 

diff --git a/tck-dist/src/main/starter/se-pom.xml b/tck-dist/src/main/starter/se-pom.xml
@@ -29,7 +29,6 @@
   <!-- General properties -->
   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-  <!-- TODO might need to update to 21 for Jakarta 11 -->
   <maven.compiler.source>17</maven.compiler.source>
   <maven.compiler.target>17</maven.compiler.target>
 

diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java
@@ -323,7 +323,6 @@ public static void assertProjectSetup(boolean standalone) {
         }
 
         // Ensure user is running on JDK 17 or higher, different JDKs produce different signatures
-        // TODO update to JDK 21 once it is GA
         int javaSpecVersion = Integer.parseInt(System.getProperty("java.specification.version"));
         assertTrue(javaSpecVersion >= 17, "The signature tests must be run on a JVM using Java 17 or higher.");