Fix bwc project resolution for changed artifacts

Author: breskeby

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

@@ -179,7 +179,7 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
         Architecture architecture = distribution.getArchitecture();
         String projectName = "";
 
-        final String archString = platform == ElasticsearchDistribution.Platform.WINDOWS ? "" : "-" + architecture.toString().toLowerCase();
+        final String archString = calculateArchString(distribution);
 
         if (distribution.getBundledJdk() == false) {
             projectName += "no-jdk-";
@@ -205,6 +205,20 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
         return projectName + architecture.classifier + "-" + distribution.getType().getName();
     }
 
+    private static String calculateArchString(ElasticsearchDistribution distribution) {
+        Architecture architecture = distribution.getArchitecture();
+        ElasticsearchDistribution.Platform platform = distribution.getPlatform();
+        Version version = Version.fromString(distribution.getVersion());
+
+        if (version.onOrAfter("9.2.0")) {
+            return platform == ElasticsearchDistribution.Platform.WINDOWS ? "" : "-" + architecture.toString().toLowerCase();
+        } else {
+            return platform == ElasticsearchDistribution.Platform.WINDOWS || architecture == Architecture.AMD64
+                ? ""
+                : "-" + architecture.toString().toLowerCase();
+        }
+    }
+
     public static class ProjectBasedDistributionDependency implements DistributionDependency {
 
         private Function<String, Dependency> function;