feat(CB2-19673): update test error email address (#162)

* feat(CB2-19673): update test error email address

* feat: upgrade to java 21

* feat: bump handlebars

Author: matthew2564

.github/workflows/build_hash.yml

@@ -11,4 +11,3 @@ jobs:
     secrets:
       CVS_MGMT_AWS_ROLE: ${{ secrets.CVS_MGMT_AWS_ROLE }}
       DVSA_AWS_REGION: ${{ secrets.DVSA_AWS_REGION }}
-

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ jobs:
   security:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Run Snyk to check for vulnerabilities
       uses: snyk/actions/gradle-jdk11@master
       with:
         args: '--all-projects'
       env:
-        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/pr-plan.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     runs-on: X64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.CVS_MGMT_AWS_ROLE }}
@@ -31,4 +31,4 @@ jobs:
          -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
          -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
          -Dsonar.projectName=${{ github.repository }} \
-         -Dsonar.projectVersion=1.0.${{ github.run_id }}
+         -Dsonar.projectVersion=1.0.${{ github.run_id }}

README.md

@@ -8,6 +8,7 @@ You will need to install the following DVSA packages to make sure you have the s
 
 - [git-secrets](https://github.com/awslabs/git-secrets)
 - [repo-security-scanner](https://github.com/UKHomeOffice/repo-security-scanner)
+- Java 21
 
 ## Installation:
 
@@ -32,3 +33,7 @@ Debugging Applications:
 ### Architeture
 
 Documentation for this service can be found [here](https://wiki.dvsacloud.uk/display/MP/Document+Generation+Service+Contract).
+
+### Unit tests
+
+To execute the unit tests, run: `./gradlew clean test`

build.gradle

@@ -1,17 +1,8 @@
-buildscript {
-    repositories {
-      mavenCentral()
-    }
-    dependencies {
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0'
-    }
-}
-
 plugins {
-    id 'com.adarshr.test-logger' version '1.1.2'
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
-    id 'org.ajoberstar.grgit' version '2.2.1'
-    id 'org.sonarqube' version '3.0'
+    id 'com.adarshr.test-logger' version '4.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'org.ajoberstar.grgit' version '5.2.1'
+    id 'org.sonarqube' version '4.4.1.3373'
 }
 
 apply plugin: 'java'
@@ -36,21 +27,43 @@ version "${version}"
 
 mainClassName = "uk.dvsa.mot.PdfGenerator"
 
-sourceCompatibility = 11
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+jacoco {
+    toolVersion = "0.8.11"
+}
 
 jacocoTestReport {
     group = "Reporting"
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.destination file("${buildDir}/reports/coverage")
+        xml.required = true
+        csv.required = false
+        html.outputLocation = file("${buildDir}/reports/coverage")
         // html.destination file("./reports/coverage")
     }
 }
 
 
 testlogger {
     theme 'mocha'
+    showExceptions true
+    showStackTraces true
+    showFullStackTraces false
+    showCauses true
+    slowThreshold 2000
+    showSummary true
+    showSimpleNames false
+    showPassed true
+    showSkipped true
+    showFailed true
+    showStandardStreams false
+    showPassedStandardStreams false
+    showSkippedStandardStreams false
+    showFailedStandardStreams true
 }
 
 idea {
@@ -65,28 +78,28 @@ repositories {
 }
 
 dependencies {
-    compile group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.1.0'
-    compile group: "com.github.jknack", name: "handlebars", version: "4.2.0"
-    compile group: 'org.xhtmlrenderer', name: 'flying-saucer-pdf-openpdf', version: '9.1.20'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
-    compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.15.0'
-    compile group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.5.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.22.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.22.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.22.1'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
-    compile fileTree(dir: 'jars', include: '*.jar')
-    testCompile group: 'junit', name: 'junit', version: '4.13.1'
-    testCompile group: 'org.jsoup', name: 'jsoup', version: '1.15.3'
-    testCompile group: 'commons-io', name: 'commons-io', version: '2.14.0'
-    testCompile group: 'com.itextpdf', name: 'itextpdf', version: '5.5.12'
+    implementation group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.1.0'
+    implementation group: "com.github.jknack", name: "handlebars", version: "4.5.0"
+    implementation group: 'org.xhtmlrenderer', name: 'flying-saucer-pdf-openpdf', version: '9.1.20'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.0'
+    implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.15.0'
+    implementation group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: '1.5.1'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.22.1'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.22.1'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.22.1'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
+    implementation fileTree(dir: 'jars', include: '*.jar')
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
+    testImplementation group: 'org.jsoup', name: 'jsoup', version: '1.15.3'
+    testImplementation group: 'commons-io', name: 'commons-io', version: '2.14.0'
+    testImplementation group: 'com.itextpdf', name: 'itextpdf', version: '5.5.12'
 }
 
 task buildZip(type: Zip) {
     from compileJava
     from processResources
     into('lib') {
-        from configurations.runtime
+        from configurations.runtimeClasspath
     }
 }
 
@@ -106,5 +119,9 @@ tasks.test {
     environment "LAMBDA_TASK_ROOT", "./src/main/resources"
 }
 
+tasks.compileTestJava {
+    dependsOn buildManifest
+}
+
 buildZip.dependsOn buildManifest
 build.dependsOn buildZip

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/views/CommercialVehicles/VTG30.hbs

@@ -371,7 +371,7 @@
                     <p class="test-information__message">
                         If any of the details are not correct, please contact DVSA by email at <br/><a
                             class="test-information__message-link"
-                            href="mailto:test.errors@dvsa.gov.uk">test.errors@dvsa.gov.uk</a> or by telephone on 0300 1239000.
+                            href="mailto:MYVT@dvsa.gov.uk">MYVT@dvsa.gov.uk</a> or by telephone on 0300 1239000.
                     </p>
                     <p class="test-information__message">
                         Find out about the vehicle’s MOT history at <a class="test-information__message-link"

src/main/resources/views/CommercialVehicles/VTG30Welsh.hbs

@@ -369,7 +369,7 @@
                     <p class="test-information__message">
                         Os nad yw unrhyw un o’r manylion yn gywir, cysylltwch â DVSA drwy e-bost ar <br/><a
                             class="test-information__message-link"
-                            href="mailto:test.errors@dvsa.gov.uk">test.errors@dvsa.gov.uk</a> neu drwy ffôn ar 0300 1239000.
+                            href="mailto:MYVT@dvsa.gov.uk">MYVT@dvsa.gov.uk</a> neu drwy ffôn ar 0300 1239000.
                     </p>
                     <p class="test-information__message">
                         Dysgwch am hanes MOT y cerbyd ar wefan <a class="test-information__message-link"

src/main/resources/views/CommercialVehicles/fail.hbs

@@ -348,7 +348,7 @@
                     <p class="test-information__message">
                         If any of the details are not correct, please contact DVSA by email at <br/><a
                             class="test-information__message-link"
-                            href="mailto:test.errors@dvsa.gov.uk">test.errors@dvsa.gov.uk</a> or by telephone on 0300 1239000.
+                            href="mailto:MYVT@dvsa.gov.uk">MYVT@dvsa.gov.uk</a> or by telephone on 0300 1239000.
                     </p>
                     <p class="test-information__message">
                         Receive a free annual MOT reminder by subscribing<br/> at <a class="test-information__message-link"

src/main/resources/views/CommercialVehicles/failWelsh.hbs

@@ -346,7 +346,7 @@
                     <p class="test-information__message">
                         Os nad yw unrhyw un o’r manylion yn gywir, cysylltwch â DVSA drwy e-bost ar <br/><a
                             class="test-information__message-link"
-                            href="mailto:test.errors@dvsa.gov.uk">test.errors@dvsa.gov.uk</a> neu drwy ffôn ar 0300 1239000.
+                            href="mailto:MYVT@dvsa.gov.uk">MYVT@dvsa.gov.uk</a> neu drwy ffôn ar 0300 1239000.
                     </p>
                     <p class="test-information__message">
                         Derbynnwch nodyn atgoffa MOT blynyddol am ddim trwy danysgrifio