Merge pull request #1269 from qdraw/feature/202310_jdk17

Feature/202310 jdk17
qdraw · Oct 31, 2023 · 9fd4c8f · 9fd4c8f
2 parents a764316 + 314b5c3
commit 9fd4c8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pipelines/azure/develop-ci.yml b/pipelines/azure/develop-ci.yml
@@ -66,6 +66,8 @@ stages:
     - checkout: self
       # fetchDepth: 1 - disable for sonarqube
 
+    - template: /pipelines/azure/steps/use_jdk_powershell.yml
+
     - template: /pipelines/azure/steps/use_dotnet_version.yml
 
     - template: /pipelines/azure/steps/build_clientapp.yml

diff --git a/pipelines/azure/steps/use_jdk11_powershell.yml b/pipelines/azure/steps/use_jdk11_powershell.yml
diff --git a/pipelines/azure/steps/use_jdk_powershell.yml b/pipelines/azure/steps/use_jdk_powershell.yml
@@ -0,0 +1,10 @@
+steps:
+  - task: PowerShell@2
+    displayName: "Use JDK17 by default (needed for sonarqube)"
+    inputs:
+      targetType: 'inline'
+      script: |
+        $jdkPath = $env:JAVA_HOME_17_X64
+        write-host "JDK Path" $jdkPath
+        Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
+        Write-Host "##vso[task.setvariable variable=PATH]$jdkPath/bin:$(PATH)"