Fix some method references by having correct imports

Author: breskeby

distribution/archives/build.gradle

@@ -12,6 +12,7 @@ import java.nio.file.Path
 
 import static org.elasticsearch.gradle.Architecture.AMD64
 import static org.elasticsearch.gradle.Architecture.AARCH64
+import org.elasticsearch.gradle.Architecture
 
 apply plugin: 'elasticsearch.internal-distribution-archive-setup'
 

distribution/build.gradle

@@ -21,6 +21,7 @@ import java.nio.file.Path
 
 import static org.elasticsearch.gradle.Architecture.AMD64
 import static org.elasticsearch.gradle.Architecture.AARCH64
+import org.elasticsearch.gradle.Architecture
 
 plugins {
   id 'base'
@@ -475,7 +476,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
 
     jdkFiles = { Project project, String os, Architecture architecture ->
       return copySpec {
-        from project.jdks."bundled_${os}_${architecture.jdkClassifier}"
+        from project.jdks."bundled_${os}_${architecture}"
         exclude "demo/**"
         /*
          * The Contents/MacOS directory interferes with notarization, and is unused by our distribution, so we exclude

distribution/packages/build.gradle

@@ -11,6 +11,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import org.elasticsearch.gradle.LoggedExec
 import org.elasticsearch.gradle.OS
 import org.redline_rpm.header.Flags
+import org.elasticsearch.gradle.Architecture
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -92,7 +93,7 @@ def commonPackageConfig(String type, Architecture architecture) {
       arch = architecture.debianClassifier
     } else {
       assert type == 'rpm': type
-      arch = architecture = architecture.jdkClassifier
+      arch = architecture.jdkClassifier
     }
     // Follow elasticsearch's file naming convention
     String prefix = "${architecture.classifier}${type}"