Moved Java22 sources to Java25

Moved Java22 tests to Java25
Added src and test src for java 21.
Updated README.md

Author: mwcw

README.md

@@ -504,7 +504,7 @@ of the following environmental variables to the relevant JAVA_HOME for that JVM.
 ```
 BC_JDK8= .. jdk8
 BC_JDK17= .. jdk17
-BC_JDK22= .. jdk22
+BC_JDK21= .. jdk21
 BC_JDK25= .. jdk25
 
 ```
@@ -514,7 +514,7 @@ For example, setting:
 ```
 export BC_JDK17=/usr/lib/jvm/java-17-amazon-corretto.x86_64
 export BC_JDK8=/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64
-export BC_JDK22=/usr/lib/jvm/java-22-amazon-corretto.x86_64
+export BC_JDK21=/usr/lib/jvm/java-21-amazon-corretto.x86_64
 export BC_JDK25=/usr/lib/jvm/java-25-amazon-corretto.x86_64
 ```
 
@@ -524,7 +524,7 @@ extra JVM specific tests tasks to the main test task.
 ```
 jostle: Adding test8 as dependency for test task because BC_JDK8 is defined
 jostle: Adding test17 as dependency for test task because BC_JDK17 is defined
-jostle: Adding test22 as dependency for test task because BC_JDK22 is defined
+jostle: Adding test21 as dependency for test task because BC_JDK21 is defined
 jostle: Adding test25 as dependency for test task because BC_JDK25 is defined
 ```
 

gradle.properties

@@ -9,4 +9,4 @@ maxVersion=1.1
 
 org.gradle.java.installations.auto-detect=false
 org.gradle.java.installations.auto-download=false
-org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK17,BC_JDK22,BC_JDK25
+org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK17,BC_JDK21,BC_JDK25

jostle/build.gradle

@@ -16,9 +16,9 @@ sourceSets {
         }
     }
 
-    java22 {
+    java21 {
         java {
-            srcDirs('src/main/java22')
+            srcDirs('src/main/java21')
         }
     }
 
@@ -42,7 +42,7 @@ dependencies {
         builtBy compileJava9Java
     }
 
-    java22Implementation files([
+    java21Implementation files([
             sourceSets.main.output.classesDirs,
             sourceSets.java9.output.classesDirs,
             sourceSets.java17.output.classesDirs]) {
@@ -53,9 +53,9 @@ dependencies {
             sourceSets.main.output.classesDirs,
             sourceSets.java9.output.classesDirs,
             sourceSets.java17.output.classesDirs,
-            sourceSets.java22.output.classesDirs
+            sourceSets.java21.output.classesDirs
     ]) {
-        builtBy compileJava22Java
+        builtBy compileJava21Java
     }
 
 }
@@ -76,8 +76,8 @@ compileJava17Java {
     options.release = 17
 }
 
-compileJava22Java {
-    options.release = 22
+compileJava21Java {
+    options.release = 21
 }
 
 compileJava25Java {
@@ -102,8 +102,8 @@ tasks.register('sourcesJar', Jar) {
     into('META-INF/versions/17') {
         from sourceSets.java17.allSource
     }
-    into('META-INF/versions/22') {
-        from sourceSets.java22.allSource
+    into('META-INF/versions/21') {
+        from sourceSets.java21.allSource
     }
 
     into('META-INF/versions/25') {
@@ -123,8 +123,8 @@ jar {
         from sourceSets.java17.output
     }
 
-    into('META-INF/versions/22') {
-        from sourceSets.java22.output
+    into('META-INF/versions/21') {
+        from sourceSets.java21.output
     }
 
     into('META-INF/versions/25') {
@@ -164,13 +164,13 @@ sourceSets {
         }
     }
 
-    test22 {
+    test21 {
         java {
             compileClasspath += files(jar.archiveFile)
             compileClasspath += main.output + test.output
             runtimeClasspath += test.output
 
-            srcDirs("src/test/java", "src/test/java22")
+            srcDirs("src/test/java", "src/test/java21")
         }
     }
 
@@ -195,9 +195,9 @@ dependencies {
     test17Implementation 'org.bouncycastle:bcprov-jdk18on:1.82'
     test17RuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-    test22Implementation 'org.junit.jupiter:junit-jupiter:5.7.1'
-    test22Implementation 'org.bouncycastle:bcprov-jdk18on:1.82'
-    test22RuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    test21Implementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    test21Implementation 'org.bouncycastle:bcprov-jdk18on:1.82'
+    test21RuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
     test25Implementation 'org.junit.jupiter:junit-jupiter:5.7.1'
     test25Implementation 'org.bouncycastle:bcprov-jdk18on:1.82'
@@ -213,8 +213,8 @@ compileTest17Java {
     options.release = 17
 }
 
-compileTest22Java {
-    options.release = 22
+compileTest21Java {
+    options.release = 21
 }
 
 compileTest25Java {
@@ -296,28 +296,29 @@ tasks.register('unitTest17', Test) {
     }
 }
 
-tasks.register('unitTest22FFI', Test) {
-    onlyIf { System.getenv("BC_JDK22") != null }
+tasks.register('unitTest21', Test) {
+    onlyIf { System.getenv("BC_JDK21") != null }
 
     dependsOn(jar)
     useJUnitPlatform()
 
-    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test22.runtimeClasspath
-    testClassesDirs += sourceSets.test22.output.classesDirs
-    testClassesDirs += sourceSets.test.output.classesDirs
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 
+    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test17.runtimeClasspath
+    testClassesDirs += sourceSets.test17.output.classesDirs
+    testClassesDirs += sourceSets.test.output.classesDirs
 
     forkEvery = 1;
     maxParallelForks = 8;
 
-    //  systemProperty 'bc.test.data.home', bcTestDataHome
+    // systemProperty 'bc.test.data.home', bcTestDataHome
     maxHeapSize = "1536m"
 
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(22)
-    }
 
-    jvmArgs = ['-Dtest.java.version.prefix=22', '-Dorg.openssl.jostle.loader.interface=ffi', '-Dtest.java.interface_type=ffi']
+    jvmArgs = ['-Dtest.java.version.prefix=21', '-Dtest.java.interface_type=jni']
+
     filter {
         excludeTestsMatching "*IntegrationTest*"
         includeTestsMatching "*Test*"
@@ -353,35 +354,6 @@ tasks.register('unitTest25FFI', Test) {
 }
 
 
-
-tasks.register('unitTest22JNI', Test) {
-    onlyIf { System.getenv("BC_JDK22") != null }
-
-    dependsOn(jar)
-    useJUnitPlatform()
-
-    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test22.runtimeClasspath
-    testClassesDirs += sourceSets.test22.output.classesDirs
-    testClassesDirs += sourceSets.test.output.classesDirs
-
-
-    forkEvery = 1;
-    maxParallelForks = 8;
-
-    //  systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(22)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=22', '-Dorg.openssl.jostle.loader.interface=jni', '-Dtest.java.interface_type=jni']
-    filter {
-        excludeTestsMatching "*IntegrationTest*"
-        includeTestsMatching "*Test*"
-    }
-}
-
 tasks.register('unitTest25JNI', Test) {
     onlyIf { System.getenv("BC_JDK25") != null }
 
@@ -490,18 +462,18 @@ tasks.register('integrationTest17', Test) {
     }
 }
 
-tasks.register('integrationTest22FFI', Test) {
-    onlyIf { System.getenv("BC_JDK22") != null }
+tasks.register('integrationTest21', Test) {
+    onlyIf { System.getenv("BC_JDK21") != null }
 
     javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(22)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 
     dependsOn(jar)
     useJUnitPlatform()
 
-    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test22.runtimeClasspath
-    testClassesDirs += sourceSets.test22.output.classesDirs
+    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test21.runtimeClasspath
+    testClassesDirs += sourceSets.test21.output.classesDirs
     testClassesDirs += sourceSets.test.output.classesDirs
 
     forkEvery = 1
@@ -511,7 +483,7 @@ tasks.register('integrationTest22FFI', Test) {
     maxHeapSize = "1536m"
 
 
-    jvmArgs = ['-Dtest.java.version.prefix=22', '-Dorg.bouncycastle.jostle.loader.interface=ffi', '-Dtest.java.interface_type=ffi']
+    jvmArgs = ['-Dtest.java.version.prefix=21', '-Dorg.bouncycastle.jostle.loader.interface=jni', '-Dtest.java.interface_type=jni']
     filter {
         includeTestsMatching "*IntegrationTest*"
         includeTestsMatching "*OpsTest*"
@@ -546,36 +518,6 @@ tasks.register('integrationTest25FFI', Test) {
     }
 }
 
-
-
-tasks.register('integrationTest22JNI', Test) {
-    onlyIf { System.getenv("BC_JDK22") != null }
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(22)
-    }
-
-    dependsOn(jar)
-    useJUnitPlatform()
-
-    classpath = files(jar.archiveFile) + sourceSets.test.runtimeClasspath + sourceSets.test22.runtimeClasspath
-    testClassesDirs += sourceSets.test22.output.classesDirs
-    testClassesDirs += sourceSets.test.output.classesDirs
-
-    forkEvery = 1
-    maxParallelForks = 1
-
-    //  systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-
-
-    jvmArgs = ['-Dtest.java.version.prefix=22', '-Dorg.bouncycastle.jostle.loader.interface=jni', '-Dtest.java.interface_type=jni']
-    filter {
-        includeTestsMatching "*IntegrationTest*"
-        includeTestsMatching "*OpsTest*"
-    }
-}
-
 tasks.register('integrationTest25JNI', Test) {
     onlyIf { System.getenv("BC_JDK25") != null }
 
@@ -620,12 +562,10 @@ if (System.getenv("BC_JDK17") != null) {
     test.dependsOn("integrationTest17")
 }
 
-if (System.getenv("BC_JDK22") != null) {
-    System.out.println("${project.name}: Adding test22 as dependency for test task because BC_JDK22 is defined")
-    test.dependsOn("unitTest22JNI")
-    test.dependsOn("integrationTest22JNI")
-    test.dependsOn("unitTest22FFI")
-    test.dependsOn("integrationTest22FFI")
+if (System.getenv("BC_JDK21") != null) {
+    System.out.println("${project.name}: Adding test21 as dependency for test task because BC_JDK21 is defined")
+    test.dependsOn("unitTest21")
+    test.dependsOn("integrationTest21")
 }
 
 if (System.getenv("BC_JDK25") != null) {