diff --git a/quarkus/service/build.gradle.kts b/quarkus/service/build.gradle.kts index ee392615aa..5010870082 100644 --- a/quarkus/service/build.gradle.kts +++ b/quarkus/service/build.gradle.kts @@ -146,9 +146,6 @@ dependencies { tasks.withType(Test::class.java).configureEach { systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager") addSparkJvmOptions() -} - -tasks.named("test").configure { if (System.getenv("AWS_REGION") == null) { environment("AWS_REGION", "us-west-2") } @@ -158,21 +155,11 @@ tasks.named("test").configure { // Need to allow a java security manager after Java 21, for Subject.getSubject to work // "getSubject is supported only if a security manager is allowed". systemProperty("java.security.manager", "allow") - maxParallelForks = 4 } -tasks.named("intTest").configure { - if (System.getenv("AWS_REGION") == null) { - environment("AWS_REGION", "us-west-2") - } - // Note: the test secrets are referenced in DropwizardServerManager - environment("POLARIS_BOOTSTRAP_CREDENTIALS", "POLARIS,root,test-admin,test-secret") - jvmArgs("--add-exports", "java.base/sun.nio.ch=ALL-UNNAMED") - // Need to allow a java security manager after Java 21, for Subject.getSubject to work - // "getSubject is supported only if a security manager is allowed". - systemProperty("java.security.manager", "allow") - maxParallelForks = 1 -} +tasks.named("test").configure { maxParallelForks = 4 } + +tasks.named("intTest").configure { maxParallelForks = 1 } /** * Adds the JPMS options required for Spark to run on Java 17, taken from the diff --git a/quarkus/service/src/main/resources/application.properties b/quarkus/service/src/main/resources/application.properties index d601ef171d..cdb201903a 100644 --- a/quarkus/service/src/main/resources/application.properties +++ b/quarkus/service/src/main/resources/application.properties @@ -147,3 +147,6 @@ polaris.authentication.token-broker.max-token-generation=PT1H %test.polaris.storage.aws.secret-key=secretKey %test.polaris.storage.gcp.token=token %test.polaris.storage.gcp.lifespan=PT1H +# Need to allow a java security manager after Java 21, for Subject.getSubject to work +# "getSubject is supported only if a security manager is allowed". +%test.quarkus.test.argLine=-Djava.security.manager=allow