Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=""

Expand Down
2 changes: 0 additions & 2 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.9'

services:

switcherac:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/re-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.native
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.8'

# volumes:
# switcherapi-snapshot:
# driver: local
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>4.0.2</version>
<version>4.0.6</version>
</parent>

<properties>
Expand All @@ -60,20 +60,20 @@

<switcher-client.version>2.5.2</switcher-client.version>
<jsonwebtoken.version>0.13.0</jsonwebtoken.version>
<joda-time.version>2.14.0</joda-time.version>
<gson.version>2.13.2</gson.version>
<springdoc.version>3.0.1</springdoc.version>
<joda-time.version>2.14.2</joda-time.version>
<gson.version>2.14.0</gson.version>
<springdoc.version>3.0.3</springdoc.version>

<!-- Test-->
<flapdoodle.embed.mongo.version>4.24.0</flapdoodle.embed.mongo.version>
<okhttp.version>5.3.2</okhttp.version>
<reactor-test.version>3.8.2</reactor-test.version>
<reactor-test.version>3.8.5</reactor-test.version>

<!-- Plugins -->
<native-image-plugin.version>0.11.4</native-image-plugin.version>
<native-image-plugin.version>1.1.0</native-image-plugin.version>
<maven-compiler.version>3.15.0</maven-compiler.version>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<sonar-maven-plugin.version>5.5.0.6356</sonar-maven-plugin.version>
<maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
<sonar-maven-plugin.version>5.7.0.6970</sonar-maven-plugin.version>
<jacoco.version>0.8.14</jacoco.version>

<!-- Sonar -->
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down