From bb82ecd6a2f46f4e9447f048ec1177d922e2ecfe Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Mon, 1 Jul 2024 16:18:57 +0200 Subject: [PATCH] Revert "don't use test keystore for vaadin (#11679)" This reverts commit 4fcefa4540eb6e3713e809326e4c63ae3b1aa3d6. --- .../src/main/kotlin/otel.java-conventions.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 22f9f28b170e..971b9f0bd4d3 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -360,10 +360,8 @@ tasks.withType().configureEach { val trustStore = project(":testing-common").file("src/misc/testing-keystore.p12") // Work around payara not working when this is set for some reason. - // Don't set for: - // - camel as we have tests that interact with AWS and need normal trustStore - // - vaadin as tests need to be able to download nodejs when not cached in ~/.vaadin/ - if (project.name != "jaxrs-2.0-payara-testing" && !project.path.contains("vaadin") && project.description != "camel-2-20") { + // Don't set for camel as we have tests that interact with AWS and need normal trustStore + if (project.name != "jaxrs-2.0-payara-testing" && project.description != "camel-2-20") { jvmArgumentProviders.add(KeystoreArgumentsProvider(trustStore)) }