From 3db91e9a733c5bca1ea6678fc9f45b7cf5584069 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 31 Jan 2025 19:08:24 +0100
Subject: [PATCH] Use the latest available jdk (#59788)

* Use the latest available jdk

* Specify toolchain in build.gradle files

* Try something else

* Update InstallJdk.ps1

* Remove unused variable `$globalJson` in InstallJdk.ps1

* Update Helix.targets

* Update GsonHubProtocolTest.java

* Update Helix.targets

* Add HelixPreCommand for non-Windows, non-Mac queues

* Update signalr.client.java.Tests.javaproj

* Update SkipHelixQueues for OSX.13.Amd64.Open

---------

Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Brennan <brecon@microsoft.com>
---
 eng/scripts/InstallJdk.ps1                                     | 3 +--
 global.json                                                    | 2 +-
 src/SignalR/clients/java/signalr/build.gradle                  | 2 +-
 .../java/signalr/test/signalr.client.java.Tests.javaproj       | 2 ++
 .../main/java/com/microsoft/signalr/GsonHubProtocolTest.java   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1
index 0dc30f7ce2f7..35dc6c8d9e0f 100644
--- a/eng/scripts/InstallJdk.ps1
+++ b/eng/scripts/InstallJdk.ps1
@@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
 $javacExe = "$installDir\bin\javac.exe"
 $tempDir = "$repoRoot\obj"
 if (-not $JdkVersion) {
-    $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
-    $JdkVersion = $globalJson.'native-tools'.jdk
+    $JdkVersion = "11.0.24"
 }
 
 if (Test-Path $javacExe) {
diff --git a/global.json b/global.json
index 0db63507f0a5..7e22a3103477 100644
--- a/global.json
+++ b/global.json
@@ -24,7 +24,7 @@
     "xcopy-msbuild": "17.8.5"
   },
   "native-tools": {
-    "jdk": "11.0.24"
+    "jdk": "latest"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1",
diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle
index 895f8c4338d3..3e192445c97e 100644
--- a/src/SignalR/clients/java/signalr/build.gradle
+++ b/src/SignalR/clients/java/signalr/build.gradle
@@ -22,7 +22,7 @@ allprojects {
     version project.findProperty('packageVersion') ?: "99.99.99-dev"
 
     java {
-        sourceCompatibility = 1.8
+        sourceCompatibility = 1.9
     }
 
     repositories {
diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
index 823c53ae8a72..e4e95d1cb3f3 100644
--- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
+++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj
@@ -6,6 +6,8 @@
     <!-- Installing Java on ARM will take some work -->
     <SkipHelixArm>true</SkipHelixArm>
     <SkipHelixAlpine>true</SkipHelixAlpine>
+    <!-- Temporary while Mac machines get new JDK -->
+    <SkipHelixQueues>OSX.13.Amd64.Open;$(SkipHelixQueues)</SkipHelixQueues>
     <PublishDir>$(OutputPath)</PublishDir>
     <TestDependsOnJava>true</TestDependsOnJava>
   </PropertyGroup>
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
index 53454be031b6..d696a74850eb 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/GsonHubProtocolTest.java
@@ -444,7 +444,7 @@ public void invocationBindingFailureWhenParsingLocalDateTimeWithoutAppropriateTy
         assertEquals(HubMessageType.INVOCATION_BINDING_FAILURE, message.getMessageType());
         InvocationBindingFailureMessage failureMessage = (InvocationBindingFailureMessage) messages.get(0);
 
-        assertEquals("java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 41 path $.arguments[0]", failureMessage.getException().getMessage());
+        assertEquals("com.google.gson.JsonSyntaxException", failureMessage.getException().getClass().getName());
     }
 
     @Test