Fix eager task creation fips plugin (elastic#78017)

vistaarjuneja · Sep 21, 2021 · 77dc033 · 77dc033
1 parent 524d1ea
commit 77dc033
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle b/build-tools-internal/src/main/groovy/elasticsearch.fips.gradle
@@ -46,16 +46,16 @@ if (BuildParams.inFipsJvm) {
           // This afterEvaluate hooks is required to avoid deprecated configuration resolution
           // This configuration can be removed once system modules are available
           def extraFipsJars = configurations.detachedConfiguration(bcFips, bcTlsFips)
-          testClusters.all {
+          testClusters.configureEach {
             extraFipsJars.files.each {
               extraJarFile it
             }
           }
         }
-        tasks.withType(TestClustersAware) {
+        tasks.withType(TestClustersAware).configureEach {
           dependsOn 'fipsResources'
         }
-        testClusters.all {
+        testClusters.configureEach {
           setTestDistribution(TestDistribution.DEFAULT)
           extraConfigFile "fips_java.security", fipsSecurity
           extraConfigFile "fips_java.policy", fipsPolicy