FACT-1800 17 to 21 changes (#1196)

* FACT-1800 17 to 21 changes

* added a little in jacoco

* added more changes

* added application.yaml for unit tests

* changed workflow and readme

Author: justiceia

.github/workflows/publish-openapi.yaml

@@ -11,4 +11,4 @@ jobs:
       SWAGGER_PUBLISHER_API_TOKEN: ${{ secrets.SWAGGER_PUBLISHER_API_TOKEN }}
     with:
       test_to_run: 'uk.gov.hmcts.reform.bulkscan.payment.processor.config.SwaggerPublisher'
-      java_version: 17
+      java_version: 21

Dockerfile

@@ -1,7 +1,7 @@
-ARG APP_INSIGHTS_AGENT_VERSION=3.4.8
+ARG APP_INSIGHTS_AGENT_VERSION=3.5.2
 
 # Application image
-FROM hmctspublic.azurecr.io/base/java:17-distroless
+FROM hmctspublic.azurecr.io/base/java:21-distroless
 
 COPY lib/applicationinsights.json /opt/app/
 

README.md

@@ -10,7 +10,7 @@ The Bulk Scan Payment Processor retrieves service bus queue messages from the pa
 ## Getting Started
 ### Prerequisites
 
-- [JDK 17](https://www.oracle.com/java)
+- [JDK 21](https://www.oracle.com/java)
 - Project requires Spring Boot v3.x to be present
 
 ## Quick Start

build.gradle

@@ -16,7 +16,7 @@ version = '0.0.1'
 
 java {
   toolchain {
-    languageVersion = JavaLanguageVersion.of(17)
+    languageVersion = JavaLanguageVersion.of(21)
   }
 }
 
@@ -99,16 +99,16 @@ pmd {
   toolVersion = "6.55.0"
   ignoreFailures = true
   sourceSets = [sourceSets.main, sourceSets.test, sourceSets.functionalTest, sourceSets.integrationTest, sourceSets.smokeTest]
-  reportsDir = file("$project.buildDir/reports/pmd")
+  reportsDir = layout.buildDirectory.dir("reports/pmd").get().asFile
   ruleSetFiles = files("config/pmd/ruleset.xml")
 }
 
 jacocoTestReport {
   executionData(test, integration)
   reports {
-    xml.required = true
-    csv.required = false
-    xml.outputLocation = file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
+    xml.required.set(true)
+    csv.required.set(false)
+    xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/test/jacocoTestReport.xml"))
   }
   afterEvaluate {
     getClassDirectories().from = getClassDirectories().files.collect {
@@ -125,6 +125,7 @@ sonarqube {
   properties {
     property "sonar.projectName", "Reform :: Bulk Scan Payment Processor"
     property "sonar.projectKey", "uk.gov.hmcts.reform:bulk-scan-payment-processor"
+    property "sonar.coverage.jacoco.xmlReportPaths", jacocoTestReport.reports.xml.outputLocation.get().asFile.absolutePath
     property "sonar.exclusions", "**/config/**,**/Application.java,**/service/servicebus/JmsPaymentMessageProcessor.java"
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/resources/application.yaml

@@ -0,0 +1,18 @@
+pay-hub:
+  api:
+    url: ${PAY_HUB_URL:AAAAAAAA}
+
+bulk-scan-procesor:
+  api:
+    url: ${PROCESSOR_URL:AAAAAAAA}
+
+idam:
+  s2s-auth:
+    url: ${S2S_URL:http://localhost:4552}
+    secret: ${S2S_SECRET:AAAAAAAAAAAAAAAA}
+  api:
+    url: ${IDAM_API_URL:AAAAAAAA}
+
+core_case_data:
+  api:
+    url: ${CORE_CASE_DATA_API_URL:AAAAAAAA}