From f701d84f0182e67894e4c035d3fdfefcdd867ea8 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 13:39:43 +0100 Subject: [PATCH 01/13] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1f2229e..ce8526a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.maritimeconnectivity.identityregistry.keycloak.spi mcp-identityregistry-keycloak-spi - 1.2.2 + 1.3.0-SNAPSHOT jar mcp-identityregistry-keycloak-spi https://maritimeconnectivity.net From d4e06923f2a4ad7b0ce63fca3af8f3ce934dd89d Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 13:40:19 +0100 Subject: [PATCH 02/13] Bump MCP-PKI version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce8526a..3bf4cad 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ net.maritimeconnectivity.pki mcp-pki - 1.2.0 + 1.3.0-SNAPSHOT org.bouncycastle From 640d16221e33f096e806cdb5f767487108880856 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 13:44:04 +0100 Subject: [PATCH 03/13] Bump Keycloak version --- pom.xml | 2 +- .../certificate/CertificateAuthenticatorTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3bf4cad..0edf6e3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 21.1.2 + 23.0.3 17 diff --git a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java index 2d74b4d..fad86f3 100644 --- a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java +++ b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java @@ -14,6 +14,7 @@ */ package net.maritimeconnectivity.identityregistry.keycloak.spi.authenticators.certificate; +import jakarta.ws.rs.core.HttpHeaders; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.keycloak.authentication.AuthenticationFlowContext; @@ -24,7 +25,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; -import javax.ws.rs.core.HttpHeaders; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; From cb978552465788f7f09c5ee83da677923b39a121 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:11:28 +0100 Subject: [PATCH 04/13] Bump httpclient version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0edf6e3..7d9674a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + 4.5.14 provided From 3647ca61060ebb77ef352f4826fdd6818594ab9e Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:19:39 +0100 Subject: [PATCH 05/13] Bump logging versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7d9674a..2a0bd0e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ org.jboss.slf4j slf4j-jboss-logmanager - 1.2.0.Final + 2.0.0.Final provided @@ -96,7 +96,7 @@ org.slf4j slf4j-simple - 2.0.3 + 2.0.9 test From ea117e971366b84f51407fd96ef151b021647553 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:21:17 +0100 Subject: [PATCH 06/13] Bump lombok versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a0bd0e..11572be 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ org.projectlombok lombok - 1.18.26 + 1.18.30 provided From 9a9c95fb131090550327915572c93d42cd4b36d1 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:27:26 +0100 Subject: [PATCH 07/13] Bump maven plugins versions --- pom.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 11572be..bdf48b5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ UTF-8 23.0.3 17 + 5.10.1 @@ -90,7 +91,7 @@ org.junit.jupiter junit-jupiter-engine - 5.9.1 + ${junit-jupiter.version} test @@ -121,12 +122,12 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 org.apache.maven.plugins maven-assembly-plugin - 3.3.0 + 3.6.0 jar-with-dependencies @@ -145,12 +146,12 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.2.3 org.junit.jupiter junit-jupiter-engine - 5.9.1 + ${junit-jupiter.version} From de973e4b3f2276e4e6f5bb6630044c055a4926e8 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:28:47 +0100 Subject: [PATCH 08/13] Bump mockito version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdf48b5..ea553cd 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ org.mockito mockito-core - 4.8.1 + 5.8.0 test From e53719fa52bf2edc2772f4febafeeb535f576030 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 18 Dec 2023 14:53:13 +0100 Subject: [PATCH 09/13] Update Dockerfile --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f4b12fd..ebceff7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/keycloak/keycloak:21.1.2 +FROM quay.io/keycloak/keycloak:23.0.3 # Set the environmental variables ENV KC_DB postgres @@ -22,7 +22,8 @@ RUN mkdir -p /mc-eventprovider-conf && chown 1000:0 /mc-eventprovider-conf USER 1000 -ADD --chown=1000:0 https://repo1.maven.org/maven2/net/maritimeconnectivity/pki/mcp-pki/1.2.0/mcp-pki-1.2.0.jar /opt/keycloak/providers/mcp-pki.jar +# Download latest snapshot +ADD --chown=1000:0 'https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=net.maritimeconnectivity.pki&a=mcp-pki&v=1.3.0-SNAPSHOT' /opt/keycloak/providers/mcp-pki.jar ADD --chown=1000:0 mcp-identityregistry-keycloak-spi-latest.jar /opt/keycloak/providers/ RUN /opt/keycloak/bin/kc.sh build From 145edf5d39cf22ad0a3f5dc290dcc2a84c499fc5 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Wed, 10 Jan 2024 10:51:08 +0100 Subject: [PATCH 10/13] Bump Keycloak to 23.0.4 --- docker/Dockerfile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ebceff7..715008d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/keycloak/keycloak:23.0.3 +FROM quay.io/keycloak/keycloak:23.0.4 # Set the environmental variables ENV KC_DB postgres diff --git a/pom.xml b/pom.xml index ea553cd..965f038 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 23.0.3 + 23.0.4 17 5.10.1 From 9eb81bc64858b6885a6f2a27a91a01dfdfa5802e Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Mon, 29 Jan 2024 15:15:46 +0100 Subject: [PATCH 11/13] Bump Keycloak to 23.0.5 --- docker/Dockerfile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 715008d..ef9e931 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/keycloak/keycloak:23.0.4 +FROM quay.io/keycloak/keycloak:23.0.5 # Set the environmental variables ENV KC_DB postgres diff --git a/pom.xml b/pom.xml index 965f038..dab6fbb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 23.0.4 + 23.0.5 17 5.10.1 From e9be7ca8eda2602370989cdecb301c7eeb3d7a46 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Fri, 16 Feb 2024 10:01:24 +0100 Subject: [PATCH 12/13] Bump Keycloak to 23.0.6 --- docker/Dockerfile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ef9e931..09974bd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/keycloak/keycloak:23.0.5 +FROM quay.io/keycloak/keycloak:23.0.6 # Set the environmental variables ENV KC_DB postgres diff --git a/pom.xml b/pom.xml index dab6fbb..40cdde9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 23.0.5 + 23.0.6 17 5.10.1 From 37e2f6385c4892cbca40143ecba5ab4bf59b2315 Mon Sep 17 00:00:00 2001 From: Oliver Steensen-Bech Haagh Date: Fri, 16 Feb 2024 10:07:38 +0100 Subject: [PATCH 13/13] Bump workflow actions versions --- .github/workflows/codeql-analysis.yml | 10 +++++----- .github/workflows/maven.yml | 10 +++++----- .github/workflows/release.yml | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 835d712..81d21f9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,11 +32,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java if: matrix.language == 'java' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -69,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d0a301a..11fd88b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' @@ -21,16 +21,16 @@ jobs: - name: Build with Maven run: mvn -B -U clean install && cp target/mcp-identityregistry-keycloak-spi-latest.jar docker/ - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GHCR if: github.event_name == 'push' && github.ref == 'refs/heads/master' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Docker image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: docker tags: ghcr.io/maritimeconnectivity/mcpkeycloakspi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e380273..8819eaa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,32 +11,32 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' - name: Build with Maven run: mvn -B -U clean install && cp target/mcp-identityregistry-keycloak-spi-latest.jar docker/ - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ghcr.io/maritimeconnectivity/mcpkeycloakspi tags: | type=semver,pattern={{version}} - name: Build and push Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: docker tags: ${{ steps.meta.outputs.tags }}