diff --git a/core/build.gradle b/core/build.gradle index 598c59057f..d3f9400fdb 100644 --- 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}" - } - } -} \ No newline at end of file diff --git a/jmail/build.gradle b/jmail/build.gradle index 5c13753044..0b1e816733 100644 --- 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 index f38a8a5f7f..a01f5be7b2 100644 --- 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}" - } - } } \ No newline at end of file diff --git a/mls/build.gradle b/mls/build.gradle index b440127fc2..b49b2c578f 100644 --- 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}" - } - } -} \ No newline at end of file diff --git a/pg/build.gradle b/pg/build.gradle index 9815e396d6..09acffaee2 100644 --- a/pg/build.gradle +++ b/pg/build.gradle @@ -6,13 +6,7 @@ sourceSets { } } - test11 { - java { - compileClasspath += main.output + test.output - runtimeClasspath += test.output - srcDir(files("src/test/java")) - } - } + } @@ -29,11 +23,6 @@ dependencies { builtBy compileJava } - testImplementation group: 'junit', name: 'junit', version: '4.13.2' - - test11Implementation group: 'junit', name: 'junit', version: '4.13.2' - test11Implementation files("$bc_prov") - test11Implementation project(path: ':core') } compileJava { @@ -103,95 +92,3 @@ test { 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*" - 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*" - 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*" - if (project.hasProperty('excludeTests')) { - excludeTestsMatching "${excludeTests}" - } - } -} \ No newline at end of file diff --git a/pkix/build.gradle b/pkix/build.gradle index 8d4db482ef..04c364b443 100644 --- a/pkix/build.gradle +++ b/pkix/build.gradle @@ -6,13 +6,7 @@ sourceSets { } } - test11 { - java { - compileClasspath += main.output + test.output - runtimeClasspath += test.output - srcDir(files("src/test/java")) - } - } + } dependencies { @@ -20,9 +14,9 @@ dependencies { implementation project(':prov') implementation project(':util') - implementation files("$bc_prov") - implementation files("$bc_util") - implementation project(path: ':core') +// implementation files("$bc_prov") +// implementation files("$bc_util") + // implementation project(path: ':core') java9Implementation project(':prov') java9Implementation project(':util') @@ -32,10 +26,6 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13.2' - test11Implementation group: 'junit', name: 'junit', version: '4.13.2' - test11Implementation files("$bc_prov") - test11Implementation files("$bc_util") - test11Implementation project(path: ':core') } compileJava { @@ -102,99 +92,3 @@ 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}" - } - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3af37c5c26..26f214a968 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ include "core" include "util" -include "mail" include "pg" include "pkix" include "prov" include "tls" include "test" include "mls" -include "jmail" \ No newline at end of file +//include "mail" +//include "jmail" \ No newline at end of file diff --git a/test/build.gradle b/test/build.gradle index d0d035facb..62e12a040f 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation fileTree(dir: 'libs', include: '*.jar') implementation project(":core") - implementation project(":mail") + // implementation project(":mail") implementation project(":pg") implementation project(":util") implementation project(":pkix") diff --git a/tls/build.gradle b/tls/build.gradle index 7a10c02cba..e92c328645 100644 --- a/tls/build.gradle +++ b/tls/build.gradle @@ -15,13 +15,6 @@ sourceSets { } } - test11 { - java { - compileClasspath += main.output + test.output - runtimeClasspath += test.output - srcDir(files("src/test/java")) - } - } } @@ -39,14 +32,6 @@ dependencies { builtBy compileJava } - - test11Implementation project(':core') - test11Implementation project(':prov') - test11Implementation project(':util') - test11Implementation project(':pkix') - - testImplementation group: 'junit', name: 'junit', version: '4.13.2' - test11Implementation group: 'junit', name: 'junit', version: '4.13.2' } compileJava { @@ -106,98 +91,3 @@ artifacts { archives sourcesJar } -// -// Do not execute tests concurrently for this project. -// -task test11(type: Test) { - - dependsOn(jar) - - testClassesDirs = sourceSets.test11.output.classesDirs - classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile) - - 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) { - - dependsOn(jar) - - testClassesDirs = sourceSets.test11.output.classesDirs - classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile) - - 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) { - - dependsOn(jar) - - testClassesDirs = sourceSets.test11.output.classesDirs - classpath = sourceSets.test11.runtimeClasspath + files(jar.archiveFile) - - 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}" - } - } -} \ No newline at end of file diff --git a/util/build.gradle b/util/build.gradle index 70d608af44..f6eef23bc4 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -10,20 +10,13 @@ sourceSets { } } - test11 { - java { - compileClasspath += main.output + test.output - runtimeClasspath += test.output - srcDir(files("src/test/java")) - } - } } dependencies { implementation project(':prov') implementation files("${bc_prov}") - implementation project(path: ':core') + // implementation project(path: ':core') implementation project(path: ':prov') testImplementation group: 'junit', name: 'junit', version: '4.11' @@ -32,12 +25,9 @@ dependencies { builtBy compileJava } java9Implementation project(':prov') - java9Implementation project(':core') + // java9Implementation project(':core') java9Implementation project(path:':prov') - test11Implementation group: 'junit', name: 'junit', version: '4.13.2' - test11Implementation files("$bc_prov") - test11Implementation project(path: ':core') } compileJava { @@ -70,14 +60,14 @@ jar { from sourceSets.java9.output } - // - // This exists because the above 'sourceSets.java9.output' is randomly - // empty even though the classes have been built and are where - // they should be. - into('META-INF/versions/9') { - from "${projectDir}/build/classes/java/java9" - duplicatesStrategy DuplicatesStrategy.INCLUDE - } +// // +// // This exists because the above 'sourceSets.java9.output' is randomly +// // empty even though the classes have been built and are where +// // they should be. +// into('META-INF/versions/9') { +// from "${projectDir}/build/classes/java/java9" +// duplicatesStrategy DuplicatesStrategy.INCLUDE +// } manifest.attributes('Multi-Release': 'true') manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8') @@ -114,99 +104,3 @@ test { 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}" - } - } -} \ No newline at end of file