From bd3a310b725b76df61479dc811330fd30fdb29bf Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 6 Feb 2025 16:32:43 +0100
Subject: [PATCH 1/4] Use the latest available JDK

---
 eng/scripts/InstallJdk.ps1                                    | 3 +--
 global.json                                                   | 4 ++--
 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, 7 insertions(+), 6 deletions(-)

diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1
index 0872f241a982..1ba711b5eaa4 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 69227aa61ad7..f9da13b63c4b 100644
--- a/global.json
+++ b/global.json
@@ -29,6 +29,6 @@
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1"
   },
   "native-tools": {
-    "jdk": "11.0.24"
+    "jdk": "latest"
   }
-}
+}
\ No newline at end of file
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

From d442b4dc12b11d2c3c726f3592a918beedbf0ca7 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 6 Feb 2025 11:21:01 -0800
Subject: [PATCH 2/4] Add newline at end of global.json file


From 418ac10d6251b6d9b64de1d089c3b57ac19b9d59 Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Thu, 6 Feb 2025 11:22:37 -0800
Subject: [PATCH 3/4] Fix spacing

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index f9da13b63c4b..f380caeeadc0 100644
--- a/global.json
+++ b/global.json
@@ -31,4 +31,4 @@
   "native-tools": {
     "jdk": "latest"
   }
-}
\ No newline at end of file
+}

From bd40ff1dbd100a0a8927716fda318ad376483a2f Mon Sep 17 00:00:00 2001
From: Korolev Dmitry <dmkorolev@microsoft.com>
Date: Fri, 31 Jan 2025 19:18:17 +0100
Subject: [PATCH 4/4] Update DelegateTests.cs

---
 src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
index 9b26dbe5ad7d..f5f54fa1dc8b 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
@@ -217,6 +217,7 @@ public async Task UpdateDelegationRuleTest()
 
     [ConditionalFact]
     [DelegateSupportedCondition(true)]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60141")]
     public async Task DelegateAfterReceiverRestart()
     {
         var queueName = Guid.NewGuid().ToString();