Merge pull request #275 from nhsuk/fix-the-java-versioning

Fix the java versioning

Author: diana-nita

azure-pipelines.yml

@@ -34,46 +34,26 @@ steps:
     customCommand: run test
     verbose: true
 
-- script: |
-    pat=$(AZURE_DEVOPS_PERSONAL_PAT)
-    azBuildId=$(curl -s -u :$pat \
-      -H "Content-Type: application/json" \
-      "https://dev.azure.com/nhsuk/nhsuk.utilities/_apis/build/latest/1395?branchName=main&resultFilter=succeeded&statusFilter=completed&api-version=7.1-preview.1" | jq '.id')
-    
-    echo "azBuildId" $azBuildId
-    echo $pat | az devops login --org "https://dev.azure.com/nhsuk/"
-    az pipelines runs artifact download \
-      --artifact-name owasp \
-      --path $(Pipeline.Workspace)/owasp \
-      --run-id $azBuildId \
-      --org "https://dev.azure.com/nhsuk/" \
-      --project nhsuk.utilities
-    
-    find $(Pipeline.Workspace)/owasp/ -type f -iname "*.sh" -exec chmod +x {} \;
-  displayName: 'Install & Login Azure DevOps Extension'
-    
-- task: Bash@3
+- task: dependency-check-build-task@6
+  displayName: 'Run OWASP Dependency Check'
   inputs:
-    filePath: '$(Pipeline.Workspace)/owasp/run_owasp_scanner.sh'
-    arguments: '--scan "$(System.DefaultWorkingDirectory)" --failOnCVSS "7" --project "nhsuk.nhsuk-prototype-kit" --out "$(System.DefaultWorkingDirectory)/dependency-scan-results" --suppression $(System.DefaultWorkingDirectory)/owasp-dependency-check-suppressions.xml --format HTML --format JUNIT --format JSON'
-  displayName: Run OWASP Dependency Check
+    projectName: 'nhsuk-prototype-kit'
+    scanPath: '$(Build.SourcesDirectory)'
+    format: 'HTML, JUNIT'
+    reportsDirectory: '$(System.DefaultWorkingDirectory)/dependency-scan-results'
+    dependencyCheckVersion: '8.4.3'
 
 - task: PublishTestResults@2
   displayName: 'Publish OWASP Dependency Check Results'
-  condition: succeededOrFailed()
   inputs:
     testResultsFormat: 'JUnit'
-    testResultsFiles: '$(System.DefaultWorkingDirectory)/dependency-scan-results/dependency-check-junit.xml'
+    testResultsFiles: '$(System.DefaultWorkingDirectory)/dependency-scan-results/*junit.xml'
     testRunTitle: 'Dependency check'
-
-- task: PublishBuildArtifacts@1
-  displayName: Publish Owasp Artifact
-  condition: succeededOrFailed()
-  inputs:
-    ArtifactName: Owasp
-    TargetPath: '$(System.DefaultWorkingDirectory)/dependency-scan-results/'
+    searchFolder: '$(Common.TestResultsDirectory)'
 
 - task: SonarCloudAnalyze@1
+  inputs:
+    jdkversion: 'JAVA_HOME_17_X64'
   displayName: 'Run SonarCloud Code Analysis'
 
 - task: SonarCloudPublish@1