Skip to content

Commit

Permalink
Stop disabling disgnostic trust manager in settings (#56916)
Browse files Browse the repository at this point in the history
Now that #56526 is merged, we do not need to explicitly disable
the diagnostic trust manager for all of our test clusters - we do
this dynamically in runtime if the combination of java version and
JSSE provider dictates that.
  • Loading branch information
jkakavas authored May 18, 2020
1 parent 60c7832 commit 35bc386
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ class BuildPlugin implements Plugin<Project> {
cluster.systemProperty('javax.net.ssl.trustStorePassword', 'password')
cluster.systemProperty('javax.net.ssl.keyStorePassword', 'password')
cluster.systemProperty('javax.net.ssl.keyStoreType', 'BCFKS')
// Can't use our DiagnosticTrustManager with SunJSSE in FIPS mode
cluster.setting 'xpack.security.ssl.diagnose.trust', 'false'
}
}
}
Expand Down Expand Up @@ -300,7 +298,7 @@ class BuildPlugin implements Plugin<Project> {
throw new GradleException(message)
}
}

private static configurePrecommit(Project project) {
TaskProvider precommit = PrecommitTasks.create(project, true)
project.tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure { it.dependsOn(precommit) }
Expand Down

0 comments on commit 35bc386

Please sign in to comment.