Fix deprecation about registerFeature for without java plugin applied

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestArtifactBasePlugin.java

@@ -11,6 +11,7 @@
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.provider.ProviderFactory;
 
 import javax.inject.Inject;
@@ -25,6 +26,7 @@ public InternalTestArtifactBasePlugin(ProviderFactory providerFactory) {
 
     @Override
     public void apply(Project project) {
+        project.getPlugins().apply(JavaPlugin.class);
         project.getPlugins().apply(ElasticsearchJavaBasePlugin.class);
         project.getExtensions().create("testArtifacts", InternalTestArtifactExtension.class, project, providerFactory);
     }

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneRestTestPlugin.java

@@ -53,15 +53,15 @@ public void apply(final Project project) {
 
         // only setup tests to build
         SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-        final SourceSet testSourceSet = sourceSets.create("test");
+        final SourceSet testSourceSet = sourceSets.maybeCreate("test");
 
         project.getTasks().withType(Test.class).configureEach(test -> {
             test.setTestClassesDirs(testSourceSet.getOutput().getClassesDirs());
             test.setClasspath(testSourceSet.getRuntimeClasspath());
         });
 
         // create a compileOnly configuration as others might expect it
-        project.getConfigurations().create("compileOnly");
+        project.getConfigurations().maybeCreate("compileOnly");
         RestTestUtil.setupJavaRestTestDependenciesDefaults(project, testSourceSet);
 
         EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);

qa/repository-multi-version/build.gradle

@@ -10,8 +10,8 @@
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 apply plugin: 'elasticsearch.internal-testclusters'
-apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
+apply plugin: 'elasticsearch.standalone-rest-test'
 
 apply plugin: 'elasticsearch.bwc-test'
 
@@ -75,3 +75,7 @@ buildParams.bwcVersions.withIndexCompatible { bwcVersion, baseName ->
     dependsOn tasks.named("${baseName}#Step4NewClusterTest")
   }
 }
+
+tasks.named('testTestingConventions').configure {
+  suffixes = ["IT"]
+}

x-pack/plugin/build.gradle

@@ -8,10 +8,10 @@
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 import org.elasticsearch.gradle.util.GradleUtils
 
+apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
 apply plugin: 'elasticsearch.validate-rest-spec'
-apply plugin: 'elasticsearch.internal-test-artifact'
 
 base {
   archivesName = 'x-pack'

x-pack/plugin/downsample/qa/mixed-cluster/build.gradle

@@ -9,7 +9,6 @@ import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
-apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'
 
 

x-pack/plugin/downsample/qa/rest/build.gradle

@@ -7,7 +7,6 @@
 
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
-apply plugin: 'elasticsearch.internal-test-artifact'
 
 dependencies {
   testImplementation project(':test:test-clusters')

x-pack/plugin/eql/qa/rest/build.gradle

@@ -8,7 +8,6 @@
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
-apply plugin: 'elasticsearch.internal-test-artifact'
 
 restResources {
   restApi {

x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle

@@ -12,7 +12,6 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
-apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'
 apply plugin: 'elasticsearch.bc-upgrade-test'
 apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin

x-pack/plugin/esql/qa/server/multi-node/build.gradle

@@ -2,7 +2,6 @@ import org.elasticsearch.gradle.util.GradleUtils
 
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
-apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
 apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
 apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin

x-pack/plugin/esql/qa/server/single-node/build.gradle

@@ -1,3 +1,4 @@
+apply plugin: 'java'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 // Necessary to use tests in Serverless