Update gradle (#64972)

* Update gradle

* update jdk

* not specific ex

* fixup

* fixup

Author: BrennanConroy

eng/helix/content/InstallJdk.ps1

@@ -45,15 +45,16 @@ Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null
 mkdir $tempDir -ea Ignore | out-null
 mkdir $installDir -ea Ignore | out-null
 Write-Host "Starting download of JDK ${JdkVersion}"
-& $PSScriptRoot\Download.ps1 "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/jdk-${JdkVersion}_windows-x64_bin.zip" $tempDir/jdk.zip
+& $PSScriptRoot\Download.ps1 "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/microsoft-jdk-${JdkVersion}-windows-x64.zip" $tempDir/jdk.zip
 Write-Host "Done downloading JDK ${JdkVersion}"
 
 Add-Type -assembly "System.IO.Compression.FileSystem"
 [System.IO.Compression.ZipFile]::ExtractToDirectory("$tempDir/jdk.zip", "$tempDir/jdk/")
 
 Write-Host "Expanded JDK to $tempDir"
 Write-Host "Installing JDK to $installDir"
-Move-Item "$tempDir/jdk/jdk-${JdkVersion}/*" $installDir
+# The name of the file directory within the zip is based on the version, but may contain a +N for build number.
+Move-Item "$(Get-ChildItem -Path "$tempDir/jdk" | Select-Object -First 1 -ExpandProperty FullName)/*" $installDir
 Write-Host "Done installing JDK to $installDir"
 Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null
 

eng/helix/content/installjdk.sh

@@ -22,7 +22,7 @@ fi
 echo "PlatformArch: $platformarch"
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 output_dir="$DIR/java"
-url="https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/java/jdk-${java_version}_${platformarch}_bin.tar.gz"
+url="https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/java/microsoft-jdk-${java_version}_${platformarch}.tar.gz"
 echo "Downloading from: $url"
 tmp="$(mktemp -d -t install-jdk.XXXXXX)"
 

eng/targets/Helix.targets

@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup Condition="'$(TestDependsOnJava)' == 'true'">
-    <HelixPreCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="call RunPowershell.cmd InstallJdk.ps1 11.0.3 %25HELIX_CORRELATION_PAYLOAD%25\jdk &amp;&amp; set %22JAVA_HOME=%25HELIX_CORRELATION_PAYLOAD%25\jdk%22" />
-    <HelixPreCommand Condition="'$(IsWindowsHelixQueue)' != 'true' AND '$(IsMacHelixQueue)' != 'true'" Include="./installjdk.sh 10.0.2 x64 &amp;&amp; if [ &quot;%24JAVA_HOME&quot; = &quot;&quot; ]%3B then export JAVA_HOME=%24PWD/java%3B fi" />
+    <HelixPreCommand Condition="'$(IsWindowsHelixQueue)' == 'true'" Include="call RunPowershell.cmd InstallJdk.ps1 21.0.5 %25HELIX_CORRELATION_PAYLOAD%25\jdk &amp;&amp; set %22JAVA_HOME=%25HELIX_CORRELATION_PAYLOAD%25\jdk%22" />
+    <HelixPreCommand Condition="'$(IsWindowsHelixQueue)' != 'true' AND '$(IsMacHelixQueue)' != 'true'" Include="./installjdk.sh 21.0.5 x64 &amp;&amp; if [ &quot;%24JAVA_HOME&quot; = &quot;&quot; ]%3B then export JAVA_HOME=%24PWD/java%3B fi" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true' AND '$(IsArm64HelixQueue)' != 'true'">

src/SignalR/clients/java/signalr/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
     maven {
-      url "https://plugins.gradle.org/m2/"
+      url = "https://plugins.gradle.org/m2/"
     }
   }
   dependencies {
@@ -19,7 +19,7 @@ allprojects {
     apply plugin: "com.diffplug.spotless"
 
     // If we're run from outside MSBuild, just assign a bogus dev version.
-    version project.findProperty('packageVersion') ?: "99.99.99-dev"
+    version = project.findProperty('packageVersion') ?: "99.99.99-dev"
 
     java {
         sourceCompatibility = 1.9

src/SignalR/clients/java/signalr/core/build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
 }
 
-group 'com.microsoft.signalr'
+group = 'com.microsoft.signalr'
 
 java {
     withJavadocJar()
@@ -26,7 +26,7 @@ publishing {
         release(MavenPublication) {
             from components.java
 
-            artifactId 'signalr'
+            artifactId = 'signalr'
 
             pom {
                 packaging = 'jar'

src/SignalR/clients/java/signalr/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists