From 3b19f6f4c8691583996fbb190dbaf8aa1afce83a Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Thu, 28 May 2026 16:53:17 -0700 Subject: [PATCH] chore(deps): bump springboot@4.0.6 and deps --- .devcontainer/Dockerfile | 2 +- .devcontainer/docker-compose.yml | 2 -- .github/workflows/master.yml | 8 ++++---- .github/workflows/re-release.yml | 8 ++++---- .github/workflows/release.yml | 8 ++++---- .github/workflows/sonar.yml | 2 +- Dockerfile | 2 +- Dockerfile.native | 4 ++-- docker-compose.yml | 2 -- pom.xml | 16 ++++++++-------- .../security/JwtTokenAuthenticationFilter.java | 2 +- 11 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6ad15a9..eee87c1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,7 +7,7 @@ ARG USER_GID=$USER_UID ARG JAVA_VERSION="25-tem" ARG INSTALL_MAVEN="true" -ARG MAVEN_VERSION="3.9.11" +ARG MAVEN_VERSION="3.9.16" ARG INSTALL_GRADLE="false" ARG GRADLE_VERSION="" diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4e6788d..de726cd 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: switcherac: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 72f4d9b..201dd6e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -41,20 +41,20 @@ jobs: steps: - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: push: true # file: ./Dockerfile.native diff --git a/.github/workflows/re-release.yml b/.github/workflows/re-release.yml index 8b0a670..4eaaaee 100644 --- a/.github/workflows/re-release.yml +++ b/.github/workflows/re-release.yml @@ -50,19 +50,19 @@ jobs: tags: ${{ github.event.inputs.tag }} - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . push: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb591d5..eb9732e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,19 +37,19 @@ jobs: images: trackerforce/switcher-ac - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . push: true diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 3bcab74..92e6691 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Get PR details id: pr - uses: actions/github-script@v7 + uses: actions/github-script@v9 with: script: | const pr = await github.rest.pulls.get({ diff --git a/Dockerfile b/Dockerfile index 7c2c6f0..607681b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.11-eclipse-temurin-25-alpine AS maven +FROM maven:3.9.16-eclipse-temurin-25-alpine AS maven WORKDIR /usr/src/app COPY . /usr/src/app diff --git a/Dockerfile.native b/Dockerfile.native index d29b46c..0569767 100644 --- a/Dockerfile.native +++ b/Dockerfile.native @@ -1,7 +1,7 @@ FROM ghcr.io/graalvm/graalvm-community:25.0.2 AS build -ARG MAVEN_VERSION=3.9.12 -ARG MAVEN_BINARY=https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz +ARG MAVEN_VERSION=3.9.16 +ARG MAVEN_BINARY=https://downloads01-he-fi.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz RUN mkdir -p /usr/share/maven /usr/share/maven/ref ADD ${MAVEN_BINARY} /tmp/apache-maven.tar.gz diff --git a/docker-compose.yml b/docker-compose.yml index 3b7238e..c2ccbad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - # volumes: # switcherapi-snapshot: # driver: local diff --git a/pom.xml b/pom.xml index 6fefab5..7949137 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.2 + 4.0.6 @@ -60,20 +60,20 @@ 2.5.2 0.13.0 - 2.14.0 - 2.13.2 - 3.0.1 + 2.14.2 + 2.14.0 + 3.0.3 4.24.0 5.3.2 - 3.8.2 + 3.8.5 - 0.11.4 + 1.1.0 3.15.0 - 3.5.4 - 5.5.0.6356 + 3.5.6 + 5.7.0.6970 0.8.14 diff --git a/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java b/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java index 0fa1f2e..9bbfc00 100644 --- a/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java +++ b/src/main/java/com/switcherapi/ac/service/security/JwtTokenAuthenticationFilter.java @@ -1,6 +1,7 @@ package com.switcherapi.ac.service.security; import com.switcherapi.ac.util.Roles; +import lombok.NonNull; import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -14,7 +15,6 @@ import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; -import reactor.util.annotation.NonNull; import java.util.List; import java.util.Map;