diff --git a/.gitignore b/.gitignore index 0150159..f58be64 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /.idea/ /build/ /reports/ +/bin/ /concourse-ci/secrets/vars.yml .dccache -.vscode \ No newline at end of file +.vscode diff --git a/build.gradle b/build.gradle index 327c49b..13a4be7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.3' + id 'org.springframework.boot' version '3.5.5' id 'io.spring.dependency-management' version '1.1.7' id 'jacoco' id 'info.solidsoft.pitest' version '1.15.0' - id "org.owasp.dependencycheck" version "12.1.0" + id "org.owasp.dependencycheck" version "12.1.1" } String buildId = project.hasProperty('buildId') ? project['buildId'] : 'DEV' @@ -25,12 +25,12 @@ repositories { ext { mapstructVersion = "1.6.3" - lombokVersion = "1.18.36" - wireMockVersion = "3.12.0" - ioCucumberVersion = "7.21.1" - springDocVersion = "2.8.5" + lombokVersion = "1.18.38" + wireMockVersion = "3.12.1" + ioCucumberVersion = "7.22.0" + springDocVersion = "2.8.6" jacocoVersion = "0.8.9" - junitVintage = "5.11.4" + junitVintage = "5.12.1" } dependencies { diff --git a/src/test/java/com/uk/companieshouse/controller/CompaniesHouseControllerTestI.java b/src/test/java/com/uk/companieshouse/controller/CompaniesHouseControllerTestI.java index cd0bc9f..3647e32 100644 --- a/src/test/java/com/uk/companieshouse/controller/CompaniesHouseControllerTestI.java +++ b/src/test/java/com/uk/companieshouse/controller/CompaniesHouseControllerTestI.java @@ -4,9 +4,8 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import static com.uk.companieshouse.utils.TestHelper.TESTCRN; @@ -21,7 +20,7 @@ @WebMvcTest(CompaniesHouseController.class) class CompaniesHouseControllerTestI { - @MockBean + @MockitoBean private CompaniesHouseService companiesHouseService; @Autowired @@ -39,4 +38,4 @@ void getCompaniesHouseResponse_whenValidCRNIsPassed_shouldReturnCHResponse() thr .andExpect(content().string(containsString(EXPECTED_RESPONSE))); } -} \ No newline at end of file +}