Update files for use in payment app.

hmcts · Jun 8, 2024 · ed021b2 · ed021b2
1 parent d5c462a
commit ed021b2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 17

diff --git a/api/liquibase.gradle b/api/liquibase.gradle
@@ -3,7 +3,7 @@ configurations {
 }
 
 dependencies {
-    liquibase group: 'org.liquibase.ext', name: 'liquibase-hibernate5', version: 3.7
+    runtimeOnly group: 'org.liquibase.ext', name: 'liquibase-hibernate5', version: '4.27.0'
 }
 
 Properties liquibaseProps = new Properties()

diff --git a/api/src/test/java/uk/gov/hmcts/fees/register/api/componenttests/IdamComponentTest.java b/api/src/test/java/uk/gov/hmcts/fees/register/api/componenttests/IdamComponentTest.java
@@ -21,7 +21,7 @@
 import uk.gov.hmcts.fees2.register.data.exceptions.UserNotFoundException;
 import uk.gov.hmcts.fees2.register.data.model.IdamUserIdResponse;
 import uk.gov.hmcts.fees2.register.data.service.IdamService;
-import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceImpl;
+import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceFrImpl;
 
 import java.util.Collections;
 
@@ -38,7 +38,7 @@ public class IdamComponentTest {
     @Mock
     private RestTemplate restTemplateIdam;
 
-    @InjectMocks private IdamService idamService = new IdamServiceImpl();
+    @InjectMocks private IdamService idamService = new IdamServiceFrImpl();
 
     IdamUserIdResponse[] idamUserIdResponse = new IdamUserIdResponse[1];
 

diff --git a/api/src/test/java/uk/gov/hmcts/fees2/register/api/controllers/FeeVersionControllerTest.java b/api/src/test/java/uk/gov/hmcts/fees2/register/api/controllers/FeeVersionControllerTest.java
@@ -14,7 +14,7 @@
 import uk.gov.hmcts.fees2.register.data.exceptions.FeeNotFoundException;
 import uk.gov.hmcts.fees2.register.data.model.DirectionType;
 import uk.gov.hmcts.fees2.register.data.model.FeeVersionStatus;
-import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceImpl;
+import uk.gov.hmcts.fees2.register.data.service.impl.IdamServiceFrImpl;
 
 import javax.servlet.http.HttpServletResponse;
 import java.security.Principal;
@@ -38,7 +38,7 @@ public class FeeVersionControllerTest extends BaseIntegrationTest {
     private HttpServletResponse response;
 
     @MockBean
-    private IdamServiceImpl idamService;
+    private IdamServiceFrImpl idamService;
 
     @Before
     public void setup(){

diff --git a/build.gradle b/build.gradle
@@ -112,10 +112,10 @@ subprojects {
     }
 
     dependencies {
-        implementation('com.sun.xml.bind:jaxb-osgi:2.3.1')
+        implementation('com.sun.xml.bind:jaxb-osgi:4.0.5')
         implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
         implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.1'
-        implementation group:'org.dom4j',name:'dom4j',version: '2.1.3'
+        implementation group: 'org.dom4j', name: 'dom4j', version: '2.1.4'
         implementation group: 'org.owasp.encoder', name: 'encoder', version: '1.2'
         testImplementation group: 'com.github.tomakehurst', name: 'wiremock-standalone', version: '2.27.2'
         compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.18.28'

diff --git a/...er/data/service/impl/IdamServiceImpl.java → .../data/service/impl/IdamServiceFrImpl.java b/...er/data/service/impl/IdamServiceImpl.java → .../data/service/impl/IdamServiceFrImpl.java
@@ -26,9 +26,9 @@
 import java.util.*;
 
 @Service
-public class IdamServiceImpl implements IdamService {
+public class IdamServiceFrImpl implements IdamService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(IdamServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IdamServiceFrImpl.class);
 
     private static final String USERID_ENDPOINT = "/api/v1/users";
 

diff --git a/model/src/test/java/uk/gov/hmcts/fees2/register/data/service/impl/IdamServiceImplTest.java b/model/src/test/java/uk/gov/hmcts/fees2/register/data/service/impl/IdamServiceImplTest.java
@@ -45,7 +45,7 @@ public class IdamServiceImplTest {
     private RestTemplate restTemplateIdam;
 
     @InjectMocks
-    private IdamServiceImpl idamService;
+    private IdamServiceFrImpl idamService;
 
     @Before
     public void initSecurityContext() {