File tree 2 files changed +16
-15
lines changed
buildSrc/src/main/groovy/org/elasticsearch/gradle
2 files changed +16
-15
lines changed Original file line number Diff line number Diff line change @@ -619,21 +619,6 @@ allprojects {
619
619
}
620
620
}
621
621
622
- subprojects {
623
- // Common config when running with a FIPS-140 runtime JVM
624
- if (project. ext. has(" inFipsJvm" ) && project. ext. inFipsJvm) {
625
- tasks. withType(Test ) {
626
- systemProperty ' javax.net.ssl.trustStorePassword' , ' password'
627
- systemProperty ' javax.net.ssl.keyStorePassword' , ' password'
628
- }
629
- project. pluginManager. withPlugin(" elasticsearch.testclusters" ) {
630
- project. testClusters. all {
631
- systemProperty ' javax.net.ssl.trustStorePassword' , ' password'
632
- systemProperty ' javax.net.ssl.keyStorePassword' , ' password'
633
- }
634
- }
635
- }
636
- }
637
622
638
623
639
624
Original file line number Diff line number Diff line change @@ -116,6 +116,22 @@ class BuildPlugin implements Plugin<Project> {
116
116
configureTestTasks(project)
117
117
configurePrecommit(project)
118
118
configureDependenciesInfo(project)
119
+
120
+ // Common config when running with a FIPS-140 runtime JVM
121
+ // Need to do it here to support external plugins
122
+ if (project. ext. inFipsJvm) {
123
+ project. tasks. withType(Test ) {
124
+ systemProperty ' javax.net.ssl.trustStorePassword' , ' password'
125
+ systemProperty ' javax.net.ssl.keyStorePassword' , ' password'
126
+ }
127
+ project. pluginManager. withPlugin(" elasticsearch.testclusters" ) {
128
+ project. testClusters. all {
129
+ systemProperty ' javax.net.ssl.trustStorePassword' , ' password'
130
+ systemProperty ' javax.net.ssl.keyStorePassword' , ' password'
131
+ }
132
+ }
133
+ }
134
+
119
135
}
120
136
121
137
You can’t perform that action at this time.
0 commit comments