Ongoing work on modernising build.

(mail and jmail left out for now)
1div0 · Feb 2, 2024 · 0ac04f7 · 0ac04f7
1 parent ca2d233
commit 0ac04f7
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 725 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -13,79 +13,3 @@ test {
     forkEvery = 1;
     maxParallelForks = 8;
 }
-
-
-task test11(type:Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-
-    jvmArgs=['-Dtest.java.version.prefix=11.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-task test17(type:Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-
-    jvmArgs=['-Dtest.java.version.prefix=17.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-task test21(type:Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-
-    jvmArgs=['-Dtest.java.version.prefix=21']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
diff --git a/jmail/build.gradle b/jmail/build.gradle
@@ -19,22 +19,22 @@ sourceSets {
 }
 
 dependencies {
-    implementation project(':prov')
-    implementation project(':util')
+//    implementation project(':prov')
+//    implementation project(':util')
     implementation project(':pkix')
 
     implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.0.1'
     implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.0.0'
-    implementation files("$bc_prov")
-    implementation files("$bc_util")
-    implementation files("$bc_pkix")
-    implementation project(path: ':core')
+//    implementation files("$bc_prov")
+//    implementation files("$bc_util")
+//    implementation files("$bc_pkix")
+  //  implementation project(path: ':core')
 
     java9Implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: '2.0.1'
     java9Implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.0.0'
-    java9Implementation files("$bc_prov")
-    java9Implementation files("$bc_util")
-    java9Implementation files("$bc_pkix")
+//    java9Implementation files("$bc_prov")
+//    java9Implementation files("$bc_util")
+//    java9Implementation files("$bc_pkix")
     java9Implementation files(sourceSets.main.output.classesDirs) {
         builtBy compileJava
     }

diff --git a/mail/build.gradle b/mail/build.gradle
@@ -8,40 +8,28 @@ sourceSets {
         }
     }
 
-    test11 {
-        java {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += test.output
-            srcDir(files("src/test/java"))
-        }
-    }
+
 }
 
 dependencies {
-    implementation project(':prov')
-    implementation project(':util')
+  //  implementation project(':prov')
+  //  implementation project(':util')
     implementation project(':pkix')
 
     implementation group: 'javax.mail', name: 'mail', version: '1.4'
-    implementation files("$bc_prov")
-    implementation files("$bc_util")
-    implementation files("$bc_pkix")
-    implementation project(path: ':core')
+//    implementation files("$bc_prov")
+//    implementation files("$bc_util")
+//    implementation files("$bc_pkix")
+//    implementation project(path: ':core')
 
     java9Implementation group: 'javax.mail', name: 'mail', version: '1.4'
-    java9Implementation files("$bc_prov")
-    java9Implementation files("$bc_util")
-    java9Implementation files("$bc_pkix")
+//    java9Implementation files("$bc_prov")
+//    java9Implementation files("$bc_util")
+//    java9Implementation files("$bc_pkix")
     java9Implementation files(sourceSets.main.output.classesDirs) {
         builtBy compileJava
     }
 
-    test11Implementation group: 'javax.mail', name: 'mail', version: '1.4'
-    test11Implementation group: 'junit', name: 'junit', version: '4.13.2'
-    test11Implementation(project(":core"))
-    test11Implementation files("$bc_prov")
-    test11Implementation files("$bc_util")
-    test11Implementation files("$bc_pkix")
 
 }
 
@@ -104,105 +92,4 @@ artifacts {
 test {
     forkEvery = 1;
     maxParallelForks = 8;
-}
-
-
-
-
-task test11(type: Test) {
-
-    dependsOn(jar)
-
-    testClassesDirs = sourceSets.test11.output.classesDirs
-    classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
-
-    forkEvery = 1;
-    maxParallelForks = 8;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=11.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        includeTestsMatching "All11Test*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-
-task test17(type: Test) {
-
-    dependsOn(jar)
-
-    testClassesDirs = sourceSets.test11.output.classesDirs
-    classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
-
-    forkEvery = 1;
-    maxParallelForks = 8;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=17.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        includeTestsMatching "All11Test*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-
-task test21(type: Test) {
-
-    dependsOn(jar)
-
-    testClassesDirs = sourceSets.test11.output.classesDirs
-    classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile)
-
-    forkEvery = 1;
-    maxParallelForks = 8;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=21']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        includeTestsMatching "All11Test*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
 }
diff --git a/mls/build.gradle b/mls/build.gradle
@@ -116,77 +116,3 @@ extractIncludeTestProto {
 
 createStartScripts('org.bouncycastle.mls.client.impl.MLSClient')
 
-task test11(type: Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(11)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=11.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-
-task test17(type: Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=17.']
-
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}
-
-task test21(type: Test) {
-    forkEvery = 1;
-    maxParallelForks = 1;
-
-    systemProperty 'bc.test.data.home', bcTestDataHome
-    maxHeapSize = "1536m"
-    testLogging.showStandardStreams = true
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
-
-    jvmArgs = ['-Dtest.java.version.prefix=21']
-
-    finalizedBy jacocoTestReport
-
-    filter {
-        includeTestsMatching "AllTest*"
-        if (project.hasProperty('excludeTests')) {
-            excludeTestsMatching "${excludeTests}"
-        }
-    }
-}