diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/BrewToolProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/BrewToolProcessor.java index 9f96761c5..2d1a11706 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/BrewToolProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/BrewToolProcessor.java @@ -143,13 +143,13 @@ protected void fillToolProperties(Map props, Distribution distri String template = null; String artifactUrl = resolveArtifactUrl(props, distribution, artifact); if (PlatformUtils.isMac(artifact.getPlatform())) { - if (artifact.getPlatform().contains("aarch64")) { + if (artifact.getPlatform().contains("aarch_64")) { template = TPL_MAC_ARM; } else { template = TPL_MAC_INTEL; } } else if (PlatformUtils.isLinux(artifact.getPlatform())) { - if (artifact.getPlatform().contains("aarch64")) { + if (artifact.getPlatform().contains("aarch_64")) { template = TPL_LINUX_ARM; } else { template = TPL_LINUX_INTEL; diff --git a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/SdkmanToolProcessor.java b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/SdkmanToolProcessor.java index 80001d5d7..0215c4ca8 100644 --- a/core/jreleaser-tools/src/main/java/org/jreleaser/tools/SdkmanToolProcessor.java +++ b/core/jreleaser-tools/src/main/java/org/jreleaser/tools/SdkmanToolProcessor.java @@ -151,14 +151,14 @@ private String mapPlatform(String platform) { return "UNIVERSAL"; } if (platform.contains("mac") || platform.contains("osx")) { - return platform.contains("aarch64") ? "MAC_ARM64" : "MAC_OSX"; + return platform.contains("aarch_64") ? "MAC_ARM64" : "MAC_OSX"; } else if (platform.contains("win")) { return "WINDOWS_64"; } else if (platform.contains("linux")) { if (platform.contains("x86_32")) return "LINUX_32"; if (platform.contains("x86_64")) return "LINUX_64"; if (platform.contains("arm_32")) return "LINUX_ARM32"; - if (platform.contains("aarch64")) return "LINUX_ARM64"; + if (platform.contains("aarch_64")) return "LINUX_ARM64"; return "LINUX_32"; } diff --git a/core/jreleaser-utils/src/main/java/org/jreleaser/util/PlatformUtils.java b/core/jreleaser-utils/src/main/java/org/jreleaser/util/PlatformUtils.java index 56556ce79..64eb8bcde 100644 --- a/core/jreleaser-utils/src/main/java/org/jreleaser/util/PlatformUtils.java +++ b/core/jreleaser-utils/src/main/java/org/jreleaser/util/PlatformUtils.java @@ -65,7 +65,7 @@ public final class PlatformUtils { "sparc_32", "sparc_64", "arm_32", - "aarch64", + "aarch_64", "mips_32", "mipsel_32", "mips_64", @@ -213,17 +213,10 @@ public static String getDetectedOs() { } public static String getDetectedArch() { - return denormalizeArch(OS_DETECTOR.get(Detector.DETECTED_ARCH)); + return OS_DETECTOR.get(Detector.DETECTED_ARCH); } public static String getDetectedVersion() { return OS_DETECTOR.get(OsDetector.DETECTED_VERSION); } - - private static String denormalizeArch(String value) { - if ("aarch_64".equals(value)) { - return "aarch64"; - } - return value; - } } diff --git a/jreleaser.yml b/jreleaser.yml index 7daa10755..f19a8ec0d 100644 --- a/jreleaser.yml +++ b/jreleaser.yml @@ -136,19 +136,19 @@ assemble: - path: '{{jdkPathPrefix}}/zulu17Osx/{{jdkFilePrefix}}-macosx_x64/zulu-17.jdk/Contents/Home' platform: 'osx-x86_64' - path: '{{jdkPathPrefix}}/zulu17OsxArm/{{jdkFilePrefix}}-macosx_aarch64/zulu-17.jdk/Contents/Home' - platform: 'osx-aarch64' + platform: 'osx-aarch_64' - path: '{{jdkPathPrefix}}/zulu17Linux/{{jdkFilePrefix}}-linux_x64' platform: 'linux-x86_64' - path: '{{jdkPathPrefix}}/zulu17LinuxArm/{{jdkFilePrefix}}-linux_aarch64' - platform: 'linux-aarch64' + platform: 'linux-aarch_64' - path: '{{jdkPathPrefix}}/zulu17LinuxMusl/{{jdkFilePrefix}}-linux_musl_x64' platform: 'linux_musl-x86_64' - path: '{{jdkPathPrefix}}/zulu17LinuxMuslArm/{{jdkFilePrefix}}-linux_musl_aarch64' - platform: 'linux_musl-aarch64' + platform: 'linux_musl-aarch_64' - path: '{{jdkPathPrefix}}/zulu17Windows/{{jdkFilePrefix}}-win_x64' platform: 'windows-x86_64' - path: '{{jdkPathPrefix}}/zulu17WindowsArm/{{jdkFilePrefix}}-win_aarch64' - platform: 'windows-aarch64' + platform: 'windows-aarch_64' mainJar: path: 'apps/jreleaser/build/libs/jreleaser-{{projectVersion}}.jar' jars: diff --git a/sdks/sdkman-java-sdk/src/main/java/org/jreleaser/sdk/sdkman/SdkmanAnnouncer.java b/sdks/sdkman-java-sdk/src/main/java/org/jreleaser/sdk/sdkman/SdkmanAnnouncer.java index bc19a6bf1..7a5c8e999 100644 --- a/sdks/sdkman-java-sdk/src/main/java/org/jreleaser/sdk/sdkman/SdkmanAnnouncer.java +++ b/sdks/sdkman-java-sdk/src/main/java/org/jreleaser/sdk/sdkman/SdkmanAnnouncer.java @@ -215,14 +215,14 @@ private String mapPlatform(String platform) { return "UNIVERSAL"; } if (platform.contains("mac") || platform.contains("osx")) { - return platform.contains("aarch64") ? "MAC_ARM64" : "MAC_OSX"; + return platform.contains("aarch_64") ? "MAC_ARM64" : "MAC_OSX"; } else if (platform.contains("win")) { return "WINDOWS_64"; } else if (platform.contains("linux")) { if (platform.contains("x86_32")) return "LINUX_32"; if (platform.contains("x86_64")) return "LINUX_64"; if (platform.contains("arm_32")) return "LINUX_ARM32"; - if (platform.contains("aarch64")) return "LINUX_ARM64"; + if (platform.contains("aarch_64")) return "LINUX_ARM64"; return "LINUX_32"; }