diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1
index 35dc6c8d9e0f8..0dc30f7ce2f74 100644
--- a/eng/scripts/InstallJdk.ps1
+++ b/eng/scripts/InstallJdk.ps1
@@ -22,7 +22,8 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
$javacExe = "$installDir\bin\javac.exe"
$tempDir = "$repoRoot\obj"
if (-not $JdkVersion) {
- $JdkVersion = "11.0.24"
+ $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
+ $JdkVersion = $globalJson.'native-tools'.jdk
}
if (Test-Path $javacExe) {
diff --git a/global.json b/global.json
index 7e22a31034771..0db63507f0a5a 100644
--- a/global.json
+++ b/global.json
@@ -24,7 +24,7 @@
"xcopy-msbuild": "17.8.5"
},
"native-tools": {
- "jdk": "latest"
+ "jdk": "11.0.24"
},
"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 3e192445c97ef..895f8c4338d30 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.9
+ sourceCompatibility = 1.8
}
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 e4e95d1cb3f3e..823c53ae8a722 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,8 +6,6 @@
true
true
-
- OSX.13.Amd64.Open;$(SkipHelixQueues)
$(OutputPath)
true
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 d696a74850eba..53454be031b69 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("com.google.gson.JsonSyntaxException", failureMessage.getException().getClass().getName());
+ assertEquals("java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 41 path $.arguments[0]", failureMessage.getException().getMessage());
}
@Test