From 78143ef7ac5e7e495b1b7b5165aa7f2acb9951ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Tue, 10 Mar 2026 17:54:31 +0100 Subject: [PATCH] chore: upgrade dependencies --- .github/dependabot.yml | 8 +++++++ .github/workflows/build_release.yaml | 35 ++++++++++------------------ .github/workflows/verify.yaml | 6 ++--- Dockerfile | 4 ++-- pom.xml | 16 ++++++------- 5 files changed, 33 insertions(+), 36 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5ace460..aa34030 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,3 +4,11 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml index ed255b9..d45447a 100644 --- a/.github/workflows/build_release.yaml +++ b/.github/workflows/build_release.yaml @@ -13,6 +13,8 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + contents: write services: registry: image: registry:2 @@ -20,56 +22,43 @@ jobs: - 5000:5000 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - 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 with: driver-opts: network=host - name: Build and push to local registry - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v7 with: context: . push: true tags: localhost:5000/name/app:latest - id: extract - uses: shrink/actions-docker-extract@v3 + uses: shrink/actions-docker-extract@v3.1.0 with: image: localhost:5000/name/app:latest path: /release/. - name: upload build artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: build path: ${{ steps.extract.outputs.destination }}/*.jar if-no-files-found: error retention-days: 14 - - name: Create release - uses: actions/create-release@v1 + - name: Create release and upload artifact if: startsWith(github.ref, 'refs/tags/') - id: create_release + uses: softprops/action-gh-release@v2.5.0 with: draft: false prerelease: false - release_name: ${{ github.ref_name }} + name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }} - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Upload release artifact - if: startsWith(github.ref, 'refs/tags/') - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.extract.outputs.destination }}/keycloak-google-groups-mapper-${{github.ref_name}}-jar-with-dependencies.jar - asset_name: keycloak-google-groups-mapper-${{github.ref_name}}-jar-with-dependencies.jar - asset_content_type: application/java-archive + files: ${{ steps.extract.outputs.destination }}/*.jar diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index bf8e0d6..b615de4 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -14,10 +14,10 @@ jobs: permissions: contents: read steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 + - uses: actions/checkout@v6 + - uses: actions/setup-java@v5 with: java-version: '21' - distribution: 'adopt' + distribution: 'temurin' - name: Verify run: mvn --batch-mode verify diff --git a/Dockerfile b/Dockerfile index 66941e2..168de38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.9.9-eclipse-temurin-21 AS build +FROM maven:3.9.13-eclipse-temurin-21 AS build WORKDIR /home/app/src @@ -7,7 +7,7 @@ RUN mvn clean verify RUN mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}-${project.version}-jar-with-dependencies.jar' --non-recursive exec:exec > /home/app/src/release-fullname.txt -FROM alpine:3 +FROM alpine:3.23.3 WORKDIR /release diff --git a/pom.xml b/pom.xml index c528ca9..4eccea7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 21 21 21 - 26.2.0 + 26.5.0 UTF-8 ${project.artifactId} @@ -64,17 +64,17 @@ com.google.apis google-api-services-admin-directory - directory_v1-rev20250325-2.0.0 + directory_v1-rev20250527-2.0.0 com.google.http-client google-http-client-jackson2 - 1.46.3 + 1.47.0 com.google.auth google-auth-library-oauth2-http - 1.33.1 + 1.35.0 @@ -86,7 +86,7 @@ org.junit.jupiter junit-jupiter - 5.12.2 + 6.0.3 test @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.7.1 + 3.8.0 @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.1 + 3.3.1 v@{project.version} @@ -128,7 +128,7 @@ org.jreleaser jreleaser-maven-plugin - 1.17.0 + 1.23.0