diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c1535e1..7b3f7f5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,6 +4,8 @@ on: push: tags: - '*' + branches: + - "docker" jobs: build: diff --git a/Dockerfile b/Dockerfile index 9312b4d..44ed2e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3.8.5-jdk-11-slim AS build +FROM maven:3.8.5-jdk-17-slim AS build WORKDIR /home/app/src diff --git a/pom.xml b/pom.xml index ff6213f..c1e6c3a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ actions-token org.jboss.aerogear jar - 0.0.7 + 0.0.8 - 11 - 15.0.2 + 17 + 22.0.0 3.5.1 11 11 @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/src/main/java/com/github/maxime1907/keycloak/actions/token/ActionsTokenResource.java b/src/main/java/com/github/maxime1907/keycloak/actions/token/ActionsTokenResource.java index 1aee2f0..2a4bc9f 100644 --- a/src/main/java/com/github/maxime1907/keycloak/actions/token/ActionsTokenResource.java +++ b/src/main/java/com/github/maxime1907/keycloak/actions/token/ActionsTokenResource.java @@ -4,20 +4,20 @@ import java.util.LinkedList; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; @@ -86,7 +86,7 @@ public Response getActionToken( ActionTokenRequest actionTokenRequest = null; try { Gson gson = new Gson(); - actionTokenRequest = gson.fromJson(jsonString, ActionTokenRequest.class); + actionTokenRequest = gson.fromJson(jsonString, ActionTokenRequest.class); } catch (IllegalArgumentException cause) { throw new WebApplicationException( ErrorResponse.error("Invalid json input.", Status.BAD_REQUEST));