Merge pull request #95 from ministryofjustice/LCAM-1297

LCAM-1297
ministryofjustice · Apr 9, 2024 · acad17b · acad17b
2 parents cd5cb74 + e6d8c00
commit acad17b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/crime-evidence/build.gradle b/crime-evidence/build.gradle
@@ -15,11 +15,12 @@ jacoco {
 }
 
 def versions = [
-        pitest                  : "1.16.0",
-        crimeCommonsVersion     : "2.13.6",
-        wmStubRunnerVersion    	: "4.1.2",
-        springDocWebMVCVersion  : "2.5.0",
-        postgresqlVersion      : "42.7.2"
+        pitest                : "1.16.0",
+        crimeCommonsClasses   : "3.2.0",
+        commonsRestClient     : "3.2.0",
+        wmStubRunnerVersion   : "4.1.2",
+        springDocWebMVCVersion: "2.5.0",
+        postgresqlVersion     : "42.7.2"
 ]
 
 java {
@@ -37,8 +38,8 @@ repositories {
 }
 
 dependencies {
-    implementation "uk.gov.justice.service.laa-crime:crime-commons-spring-boot-starter-rest-client:$versions.crimeCommonsVersion:all"
-    implementation "uk.gov.justice.service.laa-crime:crime-commons-classes:$versions.crimeCommonsVersion"
+    implementation "uk.gov.justice.service.laa-crime:crime-commons-spring-boot-starter-rest-client:$versions.commonsRestClient:all"
+    implementation "uk.gov.justice.service.laa-crime:crime-commons-classes:$versions.crimeCommonsClasses"
 
     implementation "org.springframework.boot:spring-boot-starter-validation"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/.../test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceIntegrationTest.java b/.../test/java/uk/gov/justice/laa/crime/evidence/controller/CrimeEvidenceIntegrationTest.java
@@ -41,7 +41,7 @@
 class CrimeEvidenceIntegrationTest {
 
     private static final String CCP_ENDPOINT_URL = "/api/internal/v1/evidence";
-    private static final String ERROR_MSG = "Call to service failed. Retries exhausted: 2/2.";
+    private static final String ERROR_MSG = "Call to service MAAT-API failed.";
     private static final String CALCULATE_EVIDENCE_FEE = CCP_ENDPOINT_URL.concat("/calculate-evidence-fee");
 
     private MockMvc mvc;

diff --git a/crime-evidence/src/test/resources/application.yaml b/crime-evidence/src/test/resources/application.yaml
@@ -36,11 +36,13 @@ spring:
           issuer-uri: ${crime-evidence.security.issuer-uri}
 
 springdoc:
+  packagesToScan: uk.gov.justice.laa.crime.evidence
   api-docs:
-    path: /crime-evidence
+    path: open-api/api-docs
 
-swagger-ui:
-  path: /open-api/docs.html
+  swagger-ui:
+    path: open-api/swagger-ui.html
+    operationsSorter: method
 
 services:
   maat-api: