From a36b544d23a1c987e68f1bd382ce6fa394e3f4b9 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Sun, 14 Dec 2025 12:58:16 -0800 Subject: [PATCH] Bump Springboot@4.0.0, switcher-client@2.5.2 --- .github/workflows/master.yml | 6 +-- .github/workflows/re-deploy.yml | 2 +- .github/workflows/re-release.yml | 4 +- .github/workflows/release.yml | 4 +- .github/workflows/sonar.yml | 2 +- pom.xml | 53 +++++++++++-------- .../AdminAccountControllerTest.java | 4 +- .../controller/AdminAuthControllerTest.java | 6 +-- .../AdminGitHubAuthControllerTest.java | 6 +-- .../AdminPlanControllerErrorTest.java | 4 +- .../ac/controller/ApiControllerTest.java | 2 +- .../ac/controller/ApiResourcesTest.java | 2 +- .../ac/controller/PlanControllerTest.java | 4 +- ...itcherRelayCacheLimiterControllerTest.java | 4 +- .../SwitcherRelayControllerErrorTest.java | 2 +- .../SwitcherRelayControllerTest.java | 4 +- .../fixture/ControllerTestUtils.java | 2 + 17 files changed, 56 insertions(+), 55 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6f2f1ce..72f4d9b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -68,12 +68,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: ref: 'master' - name: Checkout Kustomize - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: token: ${{ secrets.ARGOCD_PAT }} repository: switcherapi/switcher-deployment diff --git a/.github/workflows/re-deploy.yml b/.github/workflows/re-deploy.yml index 5bd2fd7..b59e408 100644 --- a/.github/workflows/re-deploy.yml +++ b/.github/workflows/re-deploy.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout Kustomize - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: token: ${{ secrets.ARGOCD_PAT }} repository: switcherapi/switcher-deployment diff --git a/.github/workflows/re-release.yml b/.github/workflows/re-release.yml index 2c1989a..8b0a670 100644 --- a/.github/workflows/re-release.yml +++ b/.github/workflows/re-release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 ref: ${{ github.event.inputs.tag }} @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 ref: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b6a2c3..bb591d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Set up JDK 25 uses: actions/setup-java@v5 with: @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Docker meta id: meta diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 3ae0b26..3bcab74 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -28,7 +28,7 @@ jobs: core.setOutput('base_ref', pr.data.base.ref); core.setOutput('head_sha', pr.data.head.sha); - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: ref: ${{ steps.pr.outputs.head_sha }} fetch-depth: 0 diff --git a/pom.xml b/pom.xml index 7f56b1d..43e560d 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.7 + 4.0.0 @@ -58,23 +58,23 @@ ${java.version} ${java.version} - 2.5.1 + 2.5.2 0.13.0 2.14.0 2.13.2 - 2.8.13 + 3.0.0 - 4.21.0 - 5.2.1 - 3.7.12 + 4.22.0 + 5.3.2 + 3.8.1 - 0.11.2 + 0.11.3 3.14.1 3.5.4 5.2.0.4988 - 0.8.13 + 0.8.14 jacoco @@ -255,13 +255,31 @@ org.springframework.boot - spring-boot-starter-test + spring-boot-starter-webflux-test test - org.springframework.security - spring-security-test + org.springframework.boot + spring-boot-starter-data-mongodb-reactive-test + test + + + + org.springframework.boot + spring-boot-starter-security-test + test + + + + org.springframework.boot + spring-boot-starter-actuator-test + test + + + + org.springframework.boot + spring-boot-starter-cache-test test @@ -288,23 +306,12 @@ de.flapdoodle.embed - de.flapdoodle.embed.mongo.spring3x + de.flapdoodle.embed.mongo.spring4x ${flapdoodle.embed.mongo.version} test - - - - - org.apache.commons - commons-lang3 - 3.18.0 - - - - diff --git a/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java index ec1e9fe..6fea272 100644 --- a/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminAccountControllerTest.java @@ -15,9 +15,9 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.security.authentication.ReactiveAuthenticationManager; diff --git a/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java index de5e1e9..78ac2a8 100644 --- a/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminAuthControllerTest.java @@ -12,9 +12,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.security.authentication.ReactiveAuthenticationManager; @@ -31,8 +31,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringBootTest -@AutoConfigureDataMongo @AutoConfigureWebTestClient +@AutoConfigureDataMongo class AdminAuthControllerTest { @Autowired AdminRepository adminRepository; diff --git a/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java b/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java index 6376b09..eb5b579 100644 --- a/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminGitHubAuthControllerTest.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.context.ApplicationContext; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -22,8 +22,8 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @SpringBootTest -@AutoConfigureDataMongo @AutoConfigureWebTestClient +@AutoConfigureDataMongo @Execution(ExecutionMode.CONCURRENT) class AdminGitHubAuthControllerTest extends AcMockWebServer { diff --git a/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java b/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java index 6473701..7b03d70 100644 --- a/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java +++ b/src/test/java/com/switcherapi/ac/controller/AdminPlanControllerErrorTest.java @@ -10,8 +10,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -21,7 +20,6 @@ @SpringBootTest @AutoConfigureDataMongo -@AutoConfigureWebTestClient @Execution(ExecutionMode.CONCURRENT) class AdminPlanControllerErrorTest { diff --git a/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java b/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java index a103736..ba0838f 100644 --- a/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/ApiControllerTest.java @@ -4,8 +4,8 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.test.web.reactive.server.WebTestClient; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java b/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java index e4e3902..5d7e3ec 100644 --- a/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java +++ b/src/test/java/com/switcherapi/ac/controller/ApiResourcesTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.ReactiveAuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java b/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java index 5b2b6bf..ba0e2d2 100644 --- a/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/PlanControllerTest.java @@ -14,8 +14,7 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -34,7 +33,6 @@ @SpringBootTest @AutoConfigureDataMongo -@AutoConfigureWebTestClient @Execution(ExecutionMode.CONCURRENT) class PlanControllerTest extends ControllerTestUtils { diff --git a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java index 768c7bb..43ed696 100644 --- a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayCacheLimiterControllerTest.java @@ -11,8 +11,7 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; import reactor.test.StepVerifier; @@ -24,7 +23,6 @@ @SpringBootTest @AutoConfigureDataMongo -@AutoConfigureWebTestClient @Execution(ExecutionMode.CONCURRENT) @TestPropertySource(properties = { "service.cache.enabled=true", diff --git a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java index c50fdf8..90773b1 100644 --- a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerErrorTest.java @@ -11,7 +11,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java index 56a8159..4f21b94 100644 --- a/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java +++ b/src/test/java/com/switcherapi/ac/controller/SwitcherRelayControllerTest.java @@ -12,8 +12,7 @@ import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient; +import org.springframework.boot.data.mongodb.test.autoconfigure.AutoConfigureDataMongo; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.web.server.ResponseStatusException; @@ -27,7 +26,6 @@ @SpringBootTest @AutoConfigureDataMongo -@AutoConfigureWebTestClient @Execution(ExecutionMode.CONCURRENT) class SwitcherRelayControllerTest extends ControllerTestUtils { diff --git a/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java b/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java index a4244f3..8a8cdb4 100644 --- a/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java +++ b/src/test/java/com/switcherapi/ac/controller/fixture/ControllerTestUtils.java @@ -11,6 +11,7 @@ import com.switcherapi.ac.service.AccountService; import com.google.gson.Gson; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.webtestclient.autoconfigure.AutoConfigureWebTestClient; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.test.web.reactive.server.WebTestClient; @@ -19,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +@AutoConfigureWebTestClient public class ControllerTestUtils { @Autowired protected WebTestClient webTestClient;