From 985c60e302f0aaddd2364642cbfb7dca71782e06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 20:35:08 +0000 Subject: [PATCH 1/2] build(deps): bump the java-dependencies group across 1 directory with 9 updates Bumps the java-dependencies group with 9 updates in the / directory: | Package | From | To | | --- | --- | --- | | [io.cucumber:cucumber-java](https://github.com/cucumber/cucumber-jvm) | `7.21.1` | `7.22.0` | | [io.cucumber:cucumber-junit](https://github.com/cucumber/cucumber-jvm) | `7.21.1` | `7.22.0` | | [io.cucumber:cucumber-spring](https://github.com/cucumber/cucumber-jvm) | `7.21.1` | `7.22.0` | | [org.junit.vintage:junit-vintage-engine](https://github.com/junit-team/junit5) | `5.11.4` | `5.12.1` | | [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) | `3.12.0` | `3.12.1` | | [org.projectlombok:lombok](https://github.com/projectlombok/lombok) | `1.18.36` | `1.18.38` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.8.5` | `2.8.6` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.4.3` | `3.4.4` | | org.owasp.dependencycheck | `12.1.0` | `12.1.1` | Updates `io.cucumber:cucumber-java` from 7.21.1 to 7.22.0 - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.21.1...v7.22.0) Updates `io.cucumber:cucumber-junit` from 7.21.1 to 7.22.0 - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.21.1...v7.22.0) Updates `io.cucumber:cucumber-spring` from 7.21.1 to 7.22.0 - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.21.1...v7.22.0) Updates `io.cucumber:cucumber-junit` from 7.21.1 to 7.22.0 - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.21.1...v7.22.0) Updates `io.cucumber:cucumber-spring` from 7.21.1 to 7.22.0 - [Release notes](https://github.com/cucumber/cucumber-jvm/releases) - [Changelog](https://github.com/cucumber/cucumber-jvm/blob/main/CHANGELOG.md) - [Commits](https://github.com/cucumber/cucumber-jvm/compare/v7.21.1...v7.22.0) Updates `org.junit.vintage:junit-vintage-engine` from 5.11.4 to 5.12.1 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.11.4...r5.12.1) Updates `org.wiremock:wiremock-standalone` from 3.12.0 to 3.12.1 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.12.0...3.12.1) Updates `org.projectlombok:lombok` from 1.18.36 to 1.18.38 - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.36...v1.18.38) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.8.5 to 2.8.6 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.8.5...v2.8.6) Updates `org.springframework.boot` from 3.4.3 to 3.4.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.3...v3.4.4) Updates `org.owasp.dependencycheck` from 12.1.0 to 12.1.1 --- updated-dependencies: - dependency-name: io.cucumber:cucumber-java dependency-version: 7.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.cucumber:cucumber-junit dependency-version: 7.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.cucumber:cucumber-spring dependency-version: 7.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.cucumber:cucumber-junit dependency-version: 7.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: io.cucumber:cucumber-spring dependency-version: 7.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.junit.vintage:junit-vintage-engine dependency-version: 5.12.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: java-dependencies - dependency-name: org.wiremock:wiremock-standalone dependency-version: 3.12.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.projectlombok:lombok dependency-version: 1.18.38 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-version: 2.8.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.springframework.boot dependency-version: 3.4.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies - dependency-name: org.owasp.dependencycheck dependency-version: 12.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: java-dependencies ... Signed-off-by: dependabot[bot] --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 327c49b..e7144c4 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.4.4' 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 { From ed00a3585e6c0df8e7360cead03ddc211bffb72b Mon Sep 17 00:00:00 2001 From: abhisheksr01 Date: Sat, 6 Sep 2025 22:45:25 +0100 Subject: [PATCH 2/2] build(gradle): bump springboot and replace deprecated annotaion --- .gitignore | 3 ++- build.gradle | 2 +- .../controller/CompaniesHouseControllerTestI.java | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) 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 e7144c4..13a4be7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.4' + 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' 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 +}