sort definition loading

Author: rjernst

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

@@ -186,8 +186,8 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest {
         def result = validateDefinitionsFails()
         then:
         assertDefinitionsFailure(result, "Transport version definition file " +
-            "[myserver/src/main/resources/transport/defined/duplicate.csv] contains id already defined in " +
-            "[myserver/src/main/resources/transport/defined/existing_92.csv]")
+            "[myserver/src/main/resources/transport/defined/existing_92.csv] contains id 8123000 already defined in " +
+            "[myserver/src/main/resources/transport/defined/duplicate.csv]")
     }
 
     def "definitions have bwc ids with non-zero patch part"() {

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

@@ -110,7 +110,8 @@ public void validateTransportVersions() throws IOException {
 
         // now load all definitions, do some validation and record them by various keys for later quick lookup
         // NOTE: this must run after loading referenced names and existing definitions
-        try (var definitionsStream = Files.list(definitionsDir)) {
+        // NOTE: this is sorted so that the order of cross validation is deterministic
+        try (var definitionsStream = Files.list(definitionsDir).sorted()) {
             for (var definitionFile : definitionsStream.toList()) {
                 recordAndValidateDefinition(readDefinitionFile(definitionFile));
             }
@@ -206,7 +207,10 @@ private void recordAndValidateDefinition(TransportVersionDefinition definition)
 
             String existing = definedIds.put(id.complete(), definition.name());
             if (existing != null) {
-                throwDefinitionFailure(definition.name(), "contains id already defined in [" + definitionRelativePath(existing) + "]");
+                throwDefinitionFailure(
+                    definition.name(),
+                    "contains id " + id + " already defined in [" + definitionRelativePath(existing) + "]"
+                );
             }
 
             if (ndx == 0) {