Some more cleanup

Author: breskeby

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

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.gradle.internal.distribution;
 
+import org.elasticsearch.gradle.Architecture;
 import org.elasticsearch.gradle.ElasticsearchDistribution;
 import org.elasticsearch.gradle.ElasticsearchDistributionType;
 import org.elasticsearch.gradle.Version;
@@ -24,7 +25,6 @@ public String getName() {
 
     @Override
     public String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
-        return ":amd64";
+        return Architecture.current().debianClassifier;
     }
-
 }

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

@@ -9,7 +9,10 @@
 
 package org.elasticsearch.gradle.internal.distribution;
 
+import org.elasticsearch.gradle.Architecture;
+import org.elasticsearch.gradle.ElasticsearchDistribution;
 import org.elasticsearch.gradle.ElasticsearchDistributionType;
+import org.elasticsearch.gradle.Version;
 
 public class RpmElasticsearchDistributionType implements ElasticsearchDistributionType {
 
@@ -29,4 +32,9 @@ public boolean shouldExtract() {
     public boolean isDocker() {
         return false;
     }
+
+    @Override
+    public String getClassifier(ElasticsearchDistribution.Platform platform, Version version) {
+        return Architecture.current().bwcClassifier;
+    }
 }

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

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

distribution/docker/build.gradle

@@ -659,7 +659,7 @@ subprojects { Project subProject ->
       it.setCompression(Compression.GZIP)
       it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image")
       it.getArchiveVersion().set("")
-      it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '')
+      it.getArchiveClassifier().set(architecture.classifier)
       it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions'))
       it.dependsOn(exportTask)
     }