Another try fixing bwc

Author: breskeby

build-tools/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java

@@ -166,7 +166,9 @@ private static String dependencyNotation(ElasticsearchDistribution distribution)
         var extension = distribution.getType().getExtension(distribution.getPlatform());
         var classifier = distribution.getType().getClassifier(distribution.getPlatform(), distroVersion);
         var group = distribution.getVersion().endsWith("-SNAPSHOT") ? FAKE_SNAPSHOT_IVY_GROUP : FAKE_IVY_GROUP;
-        return group + ":elasticsearch" + ":" + distribution.getVersion() + classifier + "@" + extension;
+        var definition = group + ":elasticsearch" + ":" + distribution.getVersion() + classifier + "@" + extension;
+
+        return definition;
     }
 
     private void setupResolutionsContainer(Project project) {

build-tools/src/main/java/org/elasticsearch/gradle/ElasticsearchDistributionType.java

@@ -26,7 +26,6 @@ default String getExtension(ElasticsearchDistribution.Platform platform) {
     }
 
     default String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
-        Architecture arch = Architecture.current();
-        return version.onOrAfter("9.2.0") ? ":" + arch.classifier : ":" + arch.bwcClassifier;
+        return ":" + Architecture.current().classifier;
     }
 }

build-tools/src/main/java/org/elasticsearch/gradle/distribution/ArchiveElasticsearchDistributionType.java

@@ -30,7 +30,10 @@ public String getExtension(ElasticsearchDistribution.Platform platform) {
 
     @Override
     public String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
-        return version.onOrAfter("7.0.0") ? ":" + platform + "-" + Architecture.current().classifier : "";
+        if (version.onOrAfter("9.2.0")) {
+            return ":" + platform + "-" + Architecture.current().classifier;
+        }
+        return version.onOrAfter("7.0.0") ? ":" + platform + "-" + Architecture.current().bwcClassifier : "";
     }
 
     @Override