Skip to content

Commit e2474fa

Browse files
BrennanConroygithub-actions
authored andcommitted
fixup
1 parent 6936106 commit e2474fa

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

eng/helix/content/InstallJdk.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Add-Type -assembly "System.IO.Compression.FileSystem"
5353

5454
Write-Host "Expanded JDK to $tempDir"
5555
Write-Host "Installing JDK to $installDir"
56-
Move-Item "$tempDir/jdk/jdk-${JdkVersion}/*" $installDir
56+
# The name of the file directory within the zip is based on the version, but may contain a +N for build number.
57+
Move-Item "$(Get-ChildItem -Path "$tempDir/jdk" | Select-Object -First 1 -ExpandProperty FullName)/*" $installDir
5758
Write-Host "Done installing JDK to $installDir"
5859
Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null
5960

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ configurations {
99
dependencies {
1010
implementation 'org.junit.jupiter:junit-jupiter-params:5.11.2'
1111
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
12-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:5.11.2'
12+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.3'
1313
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
1414
implementation 'com.google.code.gson:gson:2.8.5'
1515
implementation 'ch.qos.logback:logback-classic:1.2.3'

0 commit comments

Comments
 (0)