Skip to content

Commit

Permalink
Revert "don't use test keystore for vaadin (open-telemetry#11679)"
Browse files Browse the repository at this point in the history
This reverts commit 4fcefa4.
  • Loading branch information
zeitlinger committed Jul 1, 2024
1 parent a300516 commit bb82ecd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions conventions/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,8 @@ 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
// - 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))
}

Expand Down

0 comments on commit bb82ecd

Please sign in to comment.