[IGNORE] local testing update gradle wrapper 920

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
+distributionSha256Sum=34e7567876e1101c812db844126d6d2168970a746680e5dca9f2a213fb82547d
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-rc-2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -53,15 +53,16 @@ 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.findByName("test") == null ? sourceSets.create("test") : sourceSets.getByName("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");
+        if (project.getConfigurations().findByName("compileOnly") == null) {
+            project.getConfigurations().create("compileOnly");
+        }
         RestTestUtil.setupJavaRestTestDependenciesDefaults(project, testSourceSet);
 
         EclipseModel eclipse = project.getExtensions().getByType(EclipseModel.class);

build-tools-internal/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-9.1.0
+9.2.0-rc-2

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
+distributionSha256Sum=34e7567876e1101c812db844126d6d2168970a746680e5dca9f2a213fb82547d
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-rc-2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

libs/entitlement/qa/build.gradle

@@ -7,6 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 // Necessary to use tests in Serverless
 apply plugin: 'elasticsearch.internal-test-artifact'

muted-tests.yml

@@ -429,9 +429,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
   method: test {csv-spec:stats.CountDistinctWithConditions}
   issue: https://github.com/elastic/elasticsearch/issues/134993
-- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT
-  method: test
-  issue: https://github.com/elastic/elasticsearch/issues/135055
 - class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
   method: testLookupExplosionBigString
   issue: https://github.com/elastic/elasticsearch/issues/135122

plugins/examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b84e04fa845fecba48551f425957641074fcc00a88a84d2aae5808743b35fc85
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
+distributionSha256Sum=34e7567876e1101c812db844126d6d2168970a746680e5dca9f2a213fb82547d
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-rc-2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

qa/full-cluster-restart/build.gradle

@@ -10,6 +10,7 @@
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'

qa/lucene-index-compatibility/build.gradle

@@ -6,6 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'

qa/repository-multi-version/build.gradle

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-testclusters'
 apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'

qa/rolling-upgrade/build.gradle

@@ -10,6 +10,7 @@
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact-base'
 apply plugin: 'elasticsearch.bwc-test'

x-pack/plugin/build.gradle

@@ -8,6 +8,7 @@
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 import org.elasticsearch.gradle.util.GradleUtils
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
 apply plugin: 'elasticsearch.validate-rest-spec'

x-pack/plugin/deprecation/qa/build.gradle

@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 // Necessary to use tests in Serverless
 apply plugin: 'elasticsearch.internal-test-artifact'

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

@@ -8,6 +8,7 @@
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
+apply plugin: 'java-library'
 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

@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'
 apply plugin: 'elasticsearch.internal-test-artifact'

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

@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.yaml-rest-compat-test'

x-pack/plugin/esql/qa/security/build.gradle

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

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

@@ -10,6 +10,7 @@ import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.util.GradleUtils
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'

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

@@ -1,5 +1,6 @@
 import org.elasticsearch.gradle.util.GradleUtils
 
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-yaml-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'

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

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

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/generative/GenerativeRestTest.java

@@ -81,7 +81,9 @@ public abstract class GenerativeRestTest extends ESRestTestCase implements Query
         "time-series.*the first aggregation.*is not allowed",
         "count_star .* can't be used with TS command",
         "time_series aggregate.* can only be used with the TS command",
-        "implicit time-series aggregation function .* doesn't support type .*"
+        "implicit time-series aggregation function .* doesn't support type .*",
+        "INLINE STATS .* can only be used after STATS when used with TS command",
+        "cannot group by a metric field .* in a time-series aggregation"
     );
 
     public static final Set<Pattern> ALLOWED_ERROR_PATTERNS = ALLOWED_ERRORS.stream()

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/generator/EsqlQueryGenerator.java

@@ -133,28 +133,24 @@ public static void generatePipeline(
             if (executor.currentSchema().isEmpty()) {
                 break;
             }
-            boolean commandAllowed = false;
-            while (commandAllowed == false) {
-                commandGenerator = isTimeSeries && canGenerateTimeSeries
-                    ? randomMetricsPipeCommandGenerator()
-                    : randomPipeCommandGenerator();
-                if (isTimeSeries == false) {
-                    commandAllowed = true;
-                } else {
-                    if (commandGenerator.equals(TimeSeriesStatsGenerator.INSTANCE) || commandGenerator.equals(StatsGenerator.INSTANCE)) {
-                        if (canGenerateTimeSeries) {
-                            canGenerateTimeSeries = false;
-                            commandAllowed = true;
-                        }
-                    } else if (commandGenerator.equals(RenameGenerator.INSTANCE)) {
-                        // https://github.com/elastic/elasticsearch/issues/134994
-                        canGenerateTimeSeries = false;
-                        commandAllowed = true;
-                    } else {
-                        commandAllowed = true;
+            commandGenerator = isTimeSeries && canGenerateTimeSeries ? randomMetricsPipeCommandGenerator() : randomPipeCommandGenerator();
+            if (isTimeSeries) {
+                if (commandGenerator.equals(ForkGenerator.INSTANCE)) {
+                    // don't fork with TS command until this is resolved: https://github.com/elastic/elasticsearch/issues/136927
+                    continue;
+                }
+                if (commandGenerator.equals(TimeSeriesStatsGenerator.INSTANCE) || commandGenerator.equals(StatsGenerator.INSTANCE)) {
+                    if (canGenerateTimeSeries == false) {
+                        // Don't generate multiple stats commands in a single query for TS
+                        continue;
                     }
+                    canGenerateTimeSeries = false;
+                } else if (commandGenerator.equals(RenameGenerator.INSTANCE)) {
+                    // don't allow stats after a rename until this is resolved: https://github.com/elastic/elasticsearch/issues/134994
+                    canGenerateTimeSeries = false;
                 }
             }
+
             desc = commandGenerator.generate(executor.previousCommands(), executor.currentSchema(), schema, queryExecutor);
             if (desc == CommandGenerator.EMPTY_DESCRIPTION) {
                 continue;

x-pack/plugin/security/qa/saml-rest-tests/build.gradle

@@ -1,3 +1,4 @@
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 

x-pack/plugin/security/qa/service-account/build.gradle

@@ -1,3 +1,4 @@
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 

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

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

x-pack/qa/repository-old-versions-compatibility/build.gradle

@@ -6,6 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
+apply plugin: 'java-library'
 apply plugin: 'elasticsearch.internal-java-rest-test'
 apply plugin: 'elasticsearch.internal-test-artifact'
 apply plugin: 'elasticsearch.bwc-test'