Merge branch 'master' into response-notification-to-appliant

hmcts · Jun 28, 2024 · be34c47 · be34c47
2 parents 6a5fc6a + 2effa6b
commit be34c47
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 85 deletions.
diff --git a/build.gradle b/build.gradle
@@ -171,7 +171,7 @@ def versions = [
     feignHttpClient: '10.2.0',
     gradlePitest: '1.4.5',
     guava: '32.1.2-jre',
-    jacksonDatabind: '2.15.2',
+    jacksonDatabind: '2.16.0',
     apacheLogging: '2.20.0',
     jsonAssert: '1.2.3',
     junit: '4.13.1',
@@ -191,10 +191,10 @@ def versions = [
     spring_security_rsa: '1.0.12.RELEASE',
     springBoot: '2.7.18',
     springCloud: '3.1.6',
-    springHateoas: '0.25.1.RELEASE',
+    springHateoas: '1.5.5',
     unirest: '1.4.9',
     wiremockVersion: '2.27.2',
-    springSecurityCrypto: '5.7.5',
+    springSecurityCrypto: '5.7.11',
     tomcat   : '9.0.83',
     pact_version: '4.1.11',
     httpComponents: '4.5.13',
@@ -205,7 +205,7 @@ def versions = [
 
 ext["logback.version"] = '1.2.13'
 ext['snakeyaml.version'] = '2.2'
-ext['jackson.version'] = '2.15.2'
+ext['jackson.version'] = '2.16.0'
 ext['spring-framework.version'] = '5.3.27'
 
 

diff --git a/charts/prl-dgs/Chart.yaml b/charts/prl-dgs/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 appVersion: "1.0"
 description: Family Private Law - Document Generator Service
 name: prl-dgs
-version: 0.0.49
+version: 0.0.50
 dependencies:
     - name: java
-      version: 5.0.0
+      version: 5.2.0
       repository: "https://hmctspublic.azurecr.io/helm/v1/repo/"
diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml
@@ -21,7 +21,7 @@ java:
       MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000"
       DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true"
       PDF_TEST_ENABLED: "true"
-      CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-1999-cdam
+      CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2281-cdam
       AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
       IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
       DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net"

diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml
@@ -1,63 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-    <suppress>
-        <notes><![CDATA[log4j-api-2.17.2.jar ,log4j-to-slf4j-2.17.2.jar]]></notes>
-        <cve>CVE-2022-33915</cve>
-    </suppress>
-    <suppress>
-        <notes><![CDATA[
-      tomcat-embed-core-9.0.63.jar ]]></notes>
-        <cve>CVE-2022-34305</cve>
-    </suppress>
-    <suppress>
-      <notes><![CDATA[
-        tomcat-embed-websocket-9.0.69.jar ]]></notes>
-      <cve>CVE-2023-41080</cve>
-    </suppress>
-    <suppress>
-        <notes><![CDATA[
-      spring-core-5.3.20.jar ]]></notes>
-    <cve>CVE-2016-1000027</cve>
-  </suppress>
-  <suppress>
-    <notes><![CDATA[
-      jackson-databind-2.13.3.jar ]]></notes>
-    <cve>CVE-2023-35116</cve>
-    <cve>CVE-2022-45688</cve>
-  </suppress>
-  <suppress>
-    <notes><![CDATA[
-     tomcat-embed-core-9.0.80.jar ]]></notes>
-    <cve>CVE-2023-42794</cve>
-    <cve>CVE-2023-42795</cve>
-    <cve>CVE-2023-45648</cve>
-  </suppress>
-  <suppress>
-    <notes><![CDATA[
-     tomcat-embed-websocket-9.0.80.jar ]]></notes>
-    <cve>CVE-2023-42794</cve>
-    <cve>CVE-2023-42795</cve>
-    <cve>CVE-2023-45648</cve>
-  </suppress>
-  <suppress>
-    <notes><![CDATA[
-     spring-security-core-5.6.2.jar]]></notes>
-    <cve>CVE-2023-34034</cve>
-    <cve>CVE-2023-20862</cve>
-  </suppress>
-  <suppress>
-  <notes><![CDATA[
-   file name: spring-hateoas-0.25.1.RELEASE.jar
-   ]]></notes>
-  <packageUrl regex="true">^pkg:maven/org\.springframework\.hateoas/spring\-hateoas@.*$</packageUrl>
-  <cve>CVE-2023-34036</cve>
-  </suppress>
-  <suppress>
-    <notes>temporary></notes>
-    <cve>CVE-2023-45648</cve>
-    <cve>CVE-2023-42795</cve>
-    <cve>CVE-2023-44487</cve>
-    <cve>CVE-2023-5072</cve>
-    <cve>CVE-2023-42794</cve>
-  </suppress>
 </suppressions>
diff --git a/pacts/prl-dgs-api-CCD_CASE_DOCS_AM_API.json b/pacts/prl-dgs-api-CCD_CASE_DOCS_AM_API.json
@@ -19,7 +19,7 @@
       "response": {
         "status": 200,
         "headers": {
-          "Content-Type": "application/vnd\u6653uk\u0F27gov\u51AFhmcts\u50CDdm\u0271document\u3A9Bv11haljson;charset=UTF-8"
+          "Content-Type": "application/vnd\u63AFuk\u98E0gov\u8E83hmcts\uED68dm\u347Adocument\u7C16v1haljson;charset=UTF-8"
         },
         "matchingRules": {
           "header": {
@@ -47,13 +47,13 @@
         "method": "GET",
         "path": "/cases/documents/456c0976-3178-46dd-b9ce-5ab5d47c625a",
         "headers": {
-          "ServiceAuthorization": "someServiceAuthToken"
+          "ServiceAuthorization": "invalidServiceAuthToken"
         }
       },
       "response": {
         "status": 500,
         "headers": {
-          "Content-Type": "application/vnd\u3BE8uk\u4362gov\u4113hmcts\uFBB0dm\u4981document\u1517v1haljson;charset=UTF-8"
+          "Content-Type": "application/vnd\uF5A0uk\uE1D7gov\u0205hmcts\u0E15dm\uCDCDdocument\u0B01v111haljson;charset=UTF-8"
         },
         "matchingRules": {
           "header": {

diff --git a/pacts/prl_documentGeneratorClient-rpePdfService_PDFGenerationEndpointV2.json b/pacts/prl_documentGeneratorClient-rpePdfService_PDFGenerationEndpointV2.json
@@ -28,17 +28,6 @@
           "Content-Type": "application/pdf"
         },
         "matchingRules": {
-          "body": {
-            "$": {
-              "matchers": [
-                {
-                  "match": "contentType",
-                  "value": "application/octet-stream"
-                }
-              ],
-              "combine": "AND"
-            }
-          },
           "header": {
             "Content-Type": {
               "matchers": [

diff --git a/...in/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java b/...in/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java
@@ -12,7 +12,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
-import org.springframework.hateoas.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -180,7 +180,7 @@ document:
             -   templateName: FL-PRL-GOR-ENG-N117-General-Undertaking-Form-Final.docx
                 filename: N117CreateOrder.pdf
                 document-generator: docmosis
-            -   templateName: PRL-GOR-ENG-FL404-Occupation-Order-Draft.docx
+            -   templateName: FL-PRL-GOR-ENG-FL404-Occupation-Order-Draft.docx
                 filename: occupation_order_FL404_draft.pdf
                 document-generator: docmosis
             -   templateName: FL-PRL-GOR-ENG-FL404-Occupation-Order-Final.docx
@@ -282,10 +282,10 @@ document:
             -   templateName: FL-PRL-GOR-WEL-FL406-Power-Of-Arrest-Final.docx
                 filename: Welsh_Power_of_arrest.pdf
                 document-generator: docmosis
-            -   templateName: PRL-GOR-WEL-FL404-Occupation-Order-Final.docx
+            -   templateName: FL-PRL-GOR-WEL-FL404-Occupation-Order-Final.docx
                 filename: welsh_occupation_order_FL404_final.pdf
                 document-generator: docmosis
-            -   templateName: PRL-GOR-WEL-FL404-Occupation-Order-Draft.docx
+            -   templateName: FL-PRL-GOR-WEL-FL404-Occupation-Order-Draft.docx
                 filename: welsh_occupation_order_FL404_draft.pdf
                 document-generator: docmosis
             -   templateName: FL-PRL-GOR-WEL-FL404A-Non-Molestation-Order-Final.docx
@@ -423,6 +423,9 @@ document:
             -   templateName: PRL-LET-ENG-C100-RE7.docx
                 filename: cover_letter_re7.pdf
                 document-generator: docmosis
+            -   templateName: PRL-LET-ENG-FL401-AP1.docx
+                filename: cover_letter_ap1.pdf
+                document-generator: docmosis
             -   templateName: PRL-LET-ENG-FL401-AP2.docx
                 filename: cover_letter_ap2.pdf
                 document-generator: docmosis