use java plugin instead of elasticsearch.java plugin to apply FIPS fo…

…r test clusters

gradle/fips.gradle

@@ -14,16 +14,7 @@ if (BuildParams.inFipsJvm) {
     def bcFips = dependencies.create('org.bouncycastle:bc-fips:1.0.1')
     def bcTlsFips = dependencies.create('org.bouncycastle:bctls-fips:1.0.9')
 
-    project.afterEvaluate {
-      def extraFipsJars = configurations.detachedConfiguration(bcFips, bcTlsFips)
-      // ensure that bouncycastle is on classpath for the all of test types, must happen in evaluateAfter since the rest tests explicitly
-      // set the class path to help maintain pure black box testing, and here we are adding to that classpath
-      tasks.withType(Test).configureEach { Test test ->
-        test.setClasspath(test.getClasspath().plus(extraFipsJars))
-      }
-    }
-
-    pluginManager.withPlugin('elasticsearch.java') {
+    pluginManager.withPlugin('java') {
       TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = project.tasks.register('fipsResources', ExportElasticsearchBuildResourcesTask)
       fipsResourcesTask.configure {
         outputDir = fipsResourcesDir
@@ -32,6 +23,15 @@ if (BuildParams.inFipsJvm) {
         copy 'cacerts.bcfks'
       }
 
+      project.afterEvaluate {
+        def extraFipsJars = configurations.detachedConfiguration(bcFips, bcTlsFips)
+        // ensure that bouncycastle is on classpath for the all of test types, must happen in evaluateAfter since the rest tests explicitly
+        // set the class path to help maintain pure black box testing, and here we are adding to that classpath
+        tasks.withType(Test).configureEach { Test test ->
+          test.setClasspath(test.getClasspath().plus(extraFipsJars))
+        }
+      }
+
       pluginManager.withPlugin("elasticsearch.testclusters") {
         afterEvaluate {
           // This afterEvaluate hooks is required to avoid deprecated configuration resolution