Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't use test keystore for vaadin #11679

Merged
merged 1 commit into from
Jun 28, 2024
Merged

don't use test keystore for vaadin #11679

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions conventions/src/main/kotlin/otel.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,10 @@ tasks.withType<Test>().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
if (project.name != "jaxrs-2.0-payara-testing" && project.description != "camel-2-20") {
// 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") {
jvmArgumentProviders.add(KeystoreArgumentsProvider(trustStore))
}

Expand Down
Loading