Some cleanup

TESTING.asciidoc

@@ -472,18 +472,6 @@ You can run a group of YAML test by using wildcards:
   --tests "org.elasticsearch.test.rest.ClientYamlTestSuiteIT.test {yaml=index/*/*}"
 ---------------------------------------------------------------------------
 
-<<<<<<< HEAD
-=======
-or
-
----------------------------------------------------------------------------
-./gradlew :rest-api-spec:yamlRestTest \
-  --tests org.elasticsearch.test.rest.ClientYamlTestSuiteIT -Dtests.method="test {yaml=cat.segments/10_basic/*}"
----------------------------------------------------------------------------
-
-The latter method is preferable when the YAML suite name contains `.` (period).
-
->>>>>>> 13c8aaeffac ([Gradle] Remove static use of BuildParams (#115122))
 Note that if the selected test via the `--tests` filter is not a valid test, i.e., the YAML test
 runner is not able to parse and load it, you might get an error message indicating that the test
 was not found. In such cases, running the whole suite without using the `--tests` could show more

modules/analysis-common/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 }
 
 tasks.named("yamlRestTest").configure { task->
-  if (BuildParams.getRuntimeJavaVersion().majorVersion.toInteger() < 21) {
+  if (buildParams.getRuntimeJavaVersion().majorVersion.toInteger() < 21) {
     // Requires at least Java 21
     systemProperty 'tests.rest.blacklist', [
       "analysis-common/50_char_filters/pattern_replace error handling (too complex pattern)"

x-pack/plugin/esql/build.gradle

@@ -2,7 +2,6 @@ plugins {
   id 'idea'
 }
 
-import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask;
 import org.elasticsearch.gradle.internal.util.SourceDirectoryCommandLineArgumentProvider;
 import static org.elasticsearch.gradle.util.PlatformUtils.normalize