Update Java and Rust (#4383)

* Update Java and Rust

Signed-off-by: Ryan Aslett <raslett@linuxfoundation.org>

* Packer: Update rust installation process

Signed-off-by: Ryan Aslett <raslett@linuxfoundation.org>

---------

Signed-off-by: Ryan Aslett <raslett@linuxfoundation.org>

Author: ryanaslett

orka/templates/macos-test.pkr.hcl

@@ -38,7 +38,7 @@ variable "xcode_version" {
 
 variable "rust_version" {
   type    = string
-  default = "1.82"
+  default = "1.88"
   description = "Rust toolchain version to install via rustup. Matches RUSTC_VERSION in nodejs/node test-macos.yml."
 }
 
@@ -242,24 +242,25 @@ build {
       "${local.homebrew_path}/bin/pipx ensurepath"
     ]
   }
-  // Install Java 17 for Jenkins.
+  // Install Java 25 for Jenkins.
   provisioner "shell" {
     inline = [
       "echo 'Installing JRE...'",
       "eval \"$(${local.homebrew_path}/bin/brew shellenv)\"",
-      "${local.homebrew_path}/bin/brew install --cask temurin@17",
+      "${local.homebrew_path}/bin/brew install --cask temurin@25",
     ]
   }
   // Install Rust via rustup (matches nodejs/node test-macos.yml RUSTC_VERSION).
   provisioner "shell" {
     environment_vars = ["HOME=/Users/admin", "USER=admin"]
     inline = [
-      "echo 'Installing rustup...'",
-      "eval \"$(${local.homebrew_path}/bin/brew shellenv)\"",
-      "${local.homebrew_path}/bin/brew install rustup",
-      "echo 'Installing Rust ${var.rust_version} toolchain...'",
-      "rustup-init -y --no-modify-path --default-toolchain ${var.rust_version} --profile minimal",
-      "rustup target add x86_64-apple-darwin",
+      "echo 'Installing Rust ${var.rust_version} via rustup installer...'",
+      "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain ${var.rust_version} --profile minimal",
+      // On arm64: adds the Intel cross-compile target (arm builds x86 binaries).
+      // On x64: x86_64-apple-darwin is the host target already installed by the
+      // toolchain installer, so this is a harmless no-op. Do not make this
+      // architecture-conditional — the unconditional form is intentionally correct.
+      "/Users/admin/.cargo/bin/rustup target add x86_64-apple-darwin",
       "echo 'export PATH=\"/Users/admin/.cargo/bin:$PATH\"' >> /Users/admin/.zprofile",
       "/Users/admin/.cargo/bin/rustup --version",
       "/Users/admin/.cargo/bin/rustc --version",