cleanup

Author: rjernst

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/AbstractTransportVersionFuncTest.groovy

@@ -110,7 +110,7 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
 
     def setup() {
         configurationCacheCompatible = false
-        internalBuild([], "9.2.0", ["9.1": "9.1.1", "9.0": "9.0.2", "8.19": "8.19.7"])
+        internalBuild()
         settingsFile << """
             include ':myserver'
             include ':myplugin'

build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

@@ -172,11 +172,13 @@ abstract class AbstractGradleFuncTest extends Specification {
 
     File internalBuild(
             List<String> extraPlugins = [],
-            String currentVersion = "9.0.0",
-            Map<String, String> backportVersionsByBranch =
-                ["8.x": "8.4.0", "8.3": "8.3.0", "8.2": "8.2.1", "8.1": "8.1.3", "7.16": "7.16.10"]
+            String maintenance = "7.16.10",
+            String major4 = "8.1.3",
+            String major3 = "8.2.1",
+            String major2 = "8.3.0",
+            String major1 = "8.4.0",
+            String current = "9.0.0"
     ) {
-        Collection<String> backportVersions = backportVersionsByBranch.values()
         buildFile << """plugins {
           id 'elasticsearch.global-build-info'
           ${extraPlugins.collect { p -> "id '$p'" }.join('\n')}
@@ -187,15 +189,23 @@ abstract class AbstractGradleFuncTest extends Specification {
         import org.elasticsearch.gradle.internal.info.DevelopmentBranch
         import org.elasticsearch.gradle.Version
 
-        Version currentVersion = Version.fromString("${currentVersion}")
+        Version currentVersion = Version.fromString("${current}")
         def versionList = [
-        ${backportVersions.collect {"Version.fromString(\"${ it }\")," }.join(System.lineSeparator())}
-        currentVersion
+          Version.fromString("$maintenance"),
+          Version.fromString("$major4"),
+          Version.fromString("$major3"),
+          Version.fromString("$major2"),
+          Version.fromString("$major1"),
+          currentVersion
         ]
 
         BwcVersions versions = new BwcVersions(currentVersion, versionList, [
-            new DevelopmentBranch('main', currentVersion),
-            ${backportVersionsByBranch.collect {"new DevelopmentBranch('${ it.key }', Version.fromString(\"${ it.value }\"))," }.join(System.lineSeparator())}
+          new DevelopmentBranch('main', Version.fromString("$current")),
+          new DevelopmentBranch('8.x', Version.fromString("$major1")),
+          new DevelopmentBranch('8.3', Version.fromString("$major2")),
+          new DevelopmentBranch('8.2', Version.fromString("$major3")),
+          new DevelopmentBranch('8.1', Version.fromString("$major4")),
+          new DevelopmentBranch('7.16', Version.fromString("$maintenance")),
         ])
         buildParams.setBwcVersions(project.provider { versions } )
         """