Initial simplification of build.

Updated README.md

Author: mwcw

.gitlab-ci.yml

@@ -31,13 +31,13 @@ ant-build:
     - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/build_1_8.sh\""
 
 
-test-code-8:
+test-code:
   stage: test
   needs: [ "check-code" ]
   script:
     - "ecr_login"
     - "ecr_pull vm_base_intel latest"
-    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_8.sh\""
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test.sh\""
   artifacts:
     when: always
     reports:
@@ -51,67 +51,6 @@ test-code-8:
         - "tls/build/test-results/**/*.xml"
         - "mls/build/test-results/**/*.xml"
 
-test-code-11:
-  stage: test
-  needs: [ "check-code" ]
-  script:
-    - "ecr_login"
-    - "ecr_pull vm_base_intel latest"
-    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_11.sh\""
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "core/build/test-results/**/*.xml"
-        - "prov/build/test-results/**/*.xml"
-        - "pg/build/test-results/**/*.xml"
-        - "pkix/build/test-results/**/*.xml"
-        - "mail/build/test-results/**/*.xml"
-        - "util/build/test-results/**/*.xml"
-        - "tls/build/test-results/**/*.xml"
-        - "mls/build/test-results/**/*.xml"
-
-
-test-code-17:
-  stage: test
-  needs: [ "check-code" ]
-  script:
-    - "ecr_login"
-    - "ecr_pull vm_base_intel latest"
-    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_17.sh\""
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "core/build/test-results/**/*.xml"
-        - "prov/build/test-results/**/*.xml"
-        - "pg/build/test-results/**/*.xml"
-        - "pkix/build/test-results/**/*.xml"
-        - "mail/build/test-results/**/*.xml"
-        - "util/build/test-results/**/*.xml"
-        - "tls/build/test-results/**/*.xml"
-        - "mls/build/test-results/**/*.xml"
-
-
-test-code-21:
-  stage: test
-  needs: [ "check-code" ]
-  script:
-    - "ecr_login"
-    - "ecr_pull vm_base_intel latest"
-    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/test_21.sh\""
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "core/build/test-results/**/*.xml"
-        - "prov/build/test-results/**/*.xml"
-        - "pg/build/test-results/**/*.xml"
-        - "pkix/build/test-results/**/*.xml"
-        - "mail/build/test-results/**/*.xml"
-        - "util/build/test-results/**/*.xml"
-        - "tls/build/test-results/**/*.xml"
-        - "mls/build/test-results/**/*.xml"
 
 
 spongycastle:

README.md

@@ -10,17 +10,23 @@ Except where otherwise stated, this software is distributed under a license base
 
 **Note**: this source tree is not the FIPS version of the APIs - if you are interested in our FIPS version please contact us directly at  [[email protected]](mailto:[email protected]).
 
+## Building overview
+
+This project can now be built and tested with JDK21.
+
+If the build script detects BC_JDK8, BC_JDK11, BC_JDK17 it will add to the usual test task a dependency on test tasks 
+that specifically use the JVMs addressed by those environmental variables. 
+
+We support testing on specific JVMs as it is the only way to be certain the library is compatible.
 
 ## Environmental Variables
 
-Before invoking gradlew you need to ensure the following environmental variables are defined and point
-to valid JAVA_HOMEs for each JVM version:
+The following environmental variables can optionally point to the JAVA_HOME for each JVM version.
 
 ```
 export BC_JDK8=/path/to/java8
 export BC_JDK11=/path/to/java11
 export BC_JDK17=/path/to/java17
-export BC_JDK21=/path/to/java21
 ```
 
 ## Building
@@ -30,7 +36,8 @@ The project now uses ```gradlew``` which can be invoked for example:
 ```
 # from the root of the project
 
-# Ensure JAVA_HOME points to JDK 17 or higher JAVA_HOME
+# Ensure JAVA_HOME points to JDK 21 or higher JAVA_HOME or that
+# gradlew can find a java 21 installation to use.
 
 
 ./gradlew clean build
@@ -41,19 +48,17 @@ The gradle script will endeavour to verify their existence but not the correctne
 
 
 ## Multi-release jars and testing
-Some subprojects produce multi-release jars and these jars are tested in different jvm versions.
-Default testing on these projects is done on java 1.8 and there are specific test tasks for other versions.
-
-1. test11 test on java 11 JVM
-2. test17 test on java 17 JVM
-3. test21 test on java 21 JVM
-
-To run all of them:
+Some subprojects produce multi-release jars and these jars are can be tested on different jvm versions specifically.
 
+If the env vars are defined:
 ```
-./gradlew clean build test11 test17 test21
+export BC_JDK8=/path/to/java8
+export BC_JDK11=/path/to/java11
+export BC_JDK17=/path/to/java17
 ```
 
+If only a Java 21 JDK is present then the normal test task and test21 are run only.
+
 
 ## Code Organisation
 

build.gradle

@@ -15,11 +15,11 @@ plugins {
 }
 
 println("Environment setup:")
-["BC_JDK8", "BC_JDK11", "BC_JDK17", "BC_JDK21"].each({ it ->
+["BC_JDK8", "BC_JDK11", "BC_JDK17"].each({ it ->
     println("Looking for JDK ENV '${it}' found  ${System.getenv(it)}");
-    if (System.getenv(it) == null) {
-        throw new RuntimeException("Looking for JDK ENV '${it}' but found null, see README 'Environmental variables'");
-    }
+//    if (System.getenv(it) == null) {
+//        throw new RuntimeException("Looking for JDK ENV '${it}' but found null, see README 'Environmental variables'");
+//    }
 })
 
 
@@ -178,25 +178,25 @@ ext {
         ext.vmrange = 'jdk18on'
     }
 
-    bc_prov = "${rootProject.projectDir}/prov/build/libs/bcprov-${vmrange}-${version}.jar"
-    bc_util = "${rootProject.projectDir}/util/build/libs/bcutil-${vmrange}-${version}.jar"
-    bc_pkix = "${rootProject.projectDir}/pkix/build/libs/bcpkix-${vmrange}-${version}.jar"
-
 }
 
 
-
-
 subprojects {
     apply plugin: 'eclipse'
 
+
     JavaVersion current = JavaVersion.current();
+    int releaseVersion = 8;
     if (current.compareTo(JavaVersion.VERSION_1_8) <= 0) {
-        sourceCompatibility = 1.5
-        targetCompatibility = 1.5
-    } else {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        releaseVersion = 5
+    }
+
+    compileJava {
+        options.release = releaseVersion;
+    }
+
+    compileTestJava {
+        options.release = 8;
     }
 
 
@@ -220,7 +220,7 @@ subprojects {
         maxParallelForks = 1;
         systemProperty 'bc.test.data.home', bcTestDataHome
         maxHeapSize = "1536m"
-        testLogging.showStandardStreams = true
+        testLogging.showStandardStreams = false
 
         javaLauncher = javaToolchains.launcherFor {
             languageVersion = JavaLanguageVersion.of(8)
@@ -270,6 +270,13 @@ subprojects {
             junitXml.outputLocation = layout.buildDirectory.dir("test-results")
         }
     }
+
+    tasks.withType(JavaCompile).configureEach {
+        javaCompiler = javaToolchains.compilerFor {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
+    }
 }
 
-test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test17', ':prov:test21', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])
+
+test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test15', ':prov:test21', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])

ci/check_java.sh

@@ -9,13 +9,9 @@ set -e
 cd /workspace/bc-java
 source ci/common.sh
 
-export BC_JDK8=`openjdk_8`
-export BC_JDK11=`openjdk_11`
-export BC_JDK15=`openjdk_15`
-export BC_JDK17=`openjdk_17`
-export BC_JDK21=`openjdk_21`
 
-export JAVA_HOME=`openjdk_17`
+
+export JAVA_HOME=`openjdk_21`
 export PATH=$JAVA_HOME/bin:$PATH
 
 # Checkstyle

ci/test_11.sh ci/test.shci/test_11.sh renamed to ci/test.sh

@@ -12,13 +12,11 @@ source ci/common.sh
 export BC_JDK8=`openjdk_8`
 export BC_JDK11=`openjdk_11`
 export BC_JDK17=`openjdk_17`
-export BC_JDK21=`openjdk_21`
 
-
-export JAVA_HOME=`openjdk_17`
+export JAVA_HOME=`openjdk_21`
 export PATH=$JAVA_HOME/bin:$PATH
 
-./gradlew -stacktrace clean build test11 -x test
+./gradlew -stacktrace clean build
 
 
 

ci/test_17.sh

@@ -14,3 +14,4 @@ test {
     forkEvery = 1;
     maxParallelForks = 8;
 }
+

ci/test_21.sh

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2g
 version=1.79-SNAPSHOT
 maxVersion=1.80
-org.gradle.java.installations.auto-detect=false
+org.gradle.java.installations.auto-detect=true
 org.gradle.java.installations.auto-download=false
-org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK11,BC_JDK17,BC_JDK21
+org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK11,BC_JDK17