From 44041d41bd1746293f06e1a8c54eaccfa8f94d4a Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 13 Nov 2024 11:16:19 +0100 Subject: [PATCH] More cleanup --- TESTING.asciidoc | 2 +- build-conventions/build.gradle | 8 -------- gradle/build.versions.toml | 2 +- x-pack/plugin/fleet/qa/rest/build.gradle | 4 +--- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 1180fa55cfad3..6efdc6d3e2541 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -565,7 +565,7 @@ A common case is a new functionality that needs a BWC bridge in an unreleased ve Another use case, since the introduction of serverless, is to test BWC against main in addition to the other released branches. To do so, specify the `bwc.refspec` remote and branch to use for the BWC build as `origin/main`. To test against main, you will also need to create a new version in link:./server/src/main/java/org/elasticsearch/Version.java[Version.java], -increment `elasticsearch` in link:./build-tools-internal/version.properties[version.properties], and hard-code the `project.version` for ml-cpp +increment `elasticsearch` in link:./build-tools-internal/version.properties[version.properties], and hard-code the `project.version` for ml-cpp in link:./x-pack/plugin/ml/build.gradle[ml/build.gradle]. In general, to test the changes, you can instruct Gradle to build the BWC version from another remote/branch combination instead of pulling the release branch from GitHub. diff --git a/build-conventions/build.gradle b/build-conventions/build.gradle index 48c1d955fcf28..d8c211c0f02f9 100644 --- a/build-conventions/build.gradle +++ b/build-conventions/build.gradle @@ -23,7 +23,6 @@ plugins { id 'java-gradle-plugin' id 'java-test-fixtures' id 'eclipse' - id 'org.gradlex.build-parameters' version '1.4.4' } group = "org.elasticsearch" @@ -112,10 +111,3 @@ project.getPlugins().withType(JavaBasePlugin.class) { tasks.withType(JavaCompile).configureEach { options.incremental = System.getenv("JENKINS_URL") == null && System.getenv("BUILDKITE_BUILD_URL") == null && System.getProperty("isCI") == null } - -buildParameters { - bool('inFipsJvm') { - description = 'running tests in FIPS mode' - defaultValue = false - } -} diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 11000d22546a0..d11c4b7fd9c91 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -44,6 +44,6 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2. spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" } spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" } spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" } -spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA4" +spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" diff --git a/x-pack/plugin/fleet/qa/rest/build.gradle b/x-pack/plugin/fleet/qa/rest/build.gradle index dec624bc3cc56..0959e883997d3 100644 --- a/x-pack/plugin/fleet/qa/rest/build.gradle +++ b/x-pack/plugin/fleet/qa/rest/build.gradle @@ -5,8 +5,6 @@ * 2.0. */ -import org.elasticsearch.gradle.internal.info.BuildParams - apply plugin: 'elasticsearch.internal-yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' apply plugin: 'elasticsearch.internal-test-artifact' @@ -27,7 +25,7 @@ tasks.named('yamlRestTest') { tasks.named('yamlRestCompatTest') { usesDefaultDistribution() } -if (BuildParams.inFipsJvm){ +if (buildParams.inFipsJvm){ // This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC tasks.named("yamlRestTest").configure{enabled = false } }