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
28 changes: 9 additions & 19 deletions .github/workflows/build_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
branches:
- master

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -31,14 +34,14 @@ jobs:
driver-opts: network=host

- name: Build and push to local registry
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
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/.
Expand All @@ -51,25 +54,12 @@ jobs:
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 }}/actions-token-${{github.ref_name}}.jar
asset_name: actions-token-${{github.ref_name}}.jar
asset_content_type: application/java-archive
files: ${{ steps.extract.outputs.destination }}/actions-token-${{ github.ref_name }}.jar
5 changes: 4 additions & 1 deletion .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Conventional commit check
uses: cocogitto/cocogitto-action@v3.11
uses: cocogitto/cocogitto-action@v4.1.0
with:
command: check
5 changes: 3 additions & 2 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
java-version: '21'
distribution: 'adopt'
distribution: temurin
cache: maven
- name: Verify
run: mvn --batch-mode verify
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ FROM maven:3.9.9-eclipse-temurin-21 AS build
WORKDIR /home/app/src

COPY . /home/app/src
RUN mvn clean verify
RUN mvn --batch-mode clean verify

RUN mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}-${project.version}.jar' --non-recursive exec:exec > /home/app/src/release-fullname.txt

FROM alpine:3
FROM alpine:3.23.3

WORKDIR /release

COPY --from=build /home/app/src/release-fullname.txt /tmp/release-fullname.txt

COPY --from=build /home/app/src/target /release/target

RUN PACKAGE_NAME=`cat /tmp/release-fullname.txt` && cp "/release/target/${PACKAGE_NAME}" "/release/${PACKAGE_NAME}"
RUN PACKAGE_NAME=$(cat /tmp/release-fullname.txt) && cp "/release/target/${PACKAGE_NAME}" "/release/${PACKAGE_NAME}"

RUN rm -rf /release/target && rm -f /tmp/release-fullname.txt
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<properties>
<java.version>21</java.version>
<keycloak.version>26.0.0</keycloak.version>
<keycloak.version>26.5.0</keycloak.version>
<version.compiler.maven.plugin>3.9.9</version.compiler.maven.plugin>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<gson.version>2.10.1</gson.version>
<gson.version>2.13.1</gson.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.1</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.5.0</version>
<configuration>
<archive>
<manifestEntries>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.resources.admin.AdminAuth;
import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;
import org.keycloak.services.resources.admin.permissions.AdminPermissions;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;
import org.keycloak.services.resources.admin.fgap.AdminPermissions;

import com.google.gson.Gson;

Expand Down
Loading