From a3b1238b8b1f2d06d187948b96fd4dcf53851695 Mon Sep 17 00:00:00 2001 From: Garth <244253+xgp@users.noreply.github.com> Date: Mon, 10 Jun 2024 22:43:43 +0200 Subject: [PATCH 1/2] port to 25 --- .../java/io/phasetwo/portal/PortalEnvironment.java | 2 -- .../java/io/phasetwo/portal/PortalFeatures.java | 2 -- .../io/phasetwo/portal/PortalResourceProvider.java | 9 ++------- pom.xml | 13 +++++++++---- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ext/main/java/io/phasetwo/portal/PortalEnvironment.java b/ext/main/java/io/phasetwo/portal/PortalEnvironment.java index e515318..3a69243 100644 --- a/ext/main/java/io/phasetwo/portal/PortalEnvironment.java +++ b/ext/main/java/io/phasetwo/portal/PortalEnvironment.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import jakarta.annotation.Generated; import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -25,7 +24,6 @@ "features", "styles" }) -@Generated("jsonschema2pojo") public class PortalEnvironment { @JsonProperty("name") diff --git a/ext/main/java/io/phasetwo/portal/PortalFeatures.java b/ext/main/java/io/phasetwo/portal/PortalFeatures.java index 114e51d..f542807 100644 --- a/ext/main/java/io/phasetwo/portal/PortalFeatures.java +++ b/ext/main/java/io/phasetwo/portal/PortalFeatures.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import jakarta.annotation.Generated; import java.net.URI; import org.keycloak.authentication.requiredactions.DeleteAccount; import org.keycloak.common.Profile; @@ -43,7 +42,6 @@ "orgSsoEnabled", "orgEventsEnabled" }) -@Generated("jsonschema2pojo") public class PortalFeatures { public static String CONFIG_KEY(String property) { diff --git a/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java b/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java index b7f9a09..6abdd35 100644 --- a/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java +++ b/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java @@ -25,8 +25,6 @@ import lombok.extern.jbosslog.JBossLog; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.forms.login.freemarker.FreeMarkerLoginFormsProvider; -import org.keycloak.http.HttpRequest; -import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; @@ -76,10 +74,8 @@ public Object getResource() { } private void setupCors() { - HttpRequest request = session.getContext().getHttpRequest(); - HttpResponse response = session.getContext().getHttpResponse(); UriInfo uriInfo = session.getContext().getUri(); - Cors.add(request).allowAllOrigins().allowedMethods(METHODS).auth().build(response); + Cors.builder().allowAllOrigins().allowedMethods(METHODS).auth().add(); } private String getRealmName(RealmModel realm) { @@ -98,8 +94,7 @@ private String getRealmName(RealmModel realm) { @Path("{any:.*}") public Response preflight() { log.debug("CORS OPTIONS preflight request"); - HttpRequest request = session.getContext().getContextObject(HttpRequest.class); - return Cors.add(request, Response.ok()).auth().allowedMethods(METHODS).preflight().build(); + return Cors.builder().auth().allowedMethods(METHODS).preflight().add(Response.ok()); } /** diff --git a/pom.xml b/pom.xml index c168d81..68de928 100644 --- a/pom.xml +++ b/pom.xml @@ -26,13 +26,13 @@ - 17 + 21 UTF-8 io.phasetwo.portal - 24.0.0 - 32.0.0-jre + 25.0.0 + 33.0.0-jre 3.11 - 1.18.30 + 1.18.32 1.1.1 https://s01.oss.sonatype.org @@ -176,6 +176,11 @@ + + com.spotify.fmt + fmt-maven-plugin + 2.23 + ext/main/java From fcf7c0c1948af726b4ff610a0b87879def6f2f5a Mon Sep 17 00:00:00 2001 From: Garth <244253+xgp@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:38:10 +0200 Subject: [PATCH 2/2] removed build step from release yaml. --- .github/workflows/release.yml | 7 ------- .github/workflows/test.yml | 19 ------------------- .../portal/PortalResourceProvider.java | 1 - 3 files changed, 27 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a124c6..600a34b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,13 +13,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Build and Test - uses: qcastel/github-actions-maven-cmd@master - env: - CI: '' - with: - maven-args: "clean install -Dmaven.test.skip=true -Ddockerfile.skip -DdockerCompose.skip -Djib.skip" - - name: Release uses: qcastel/github-actions-maven-release@master env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 40d00bd..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: test - -on: - pull_request: - branches: [main] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Build and Test - uses: qcastel/github-actions-maven-cmd@master - env: - CI: "" - with: - maven-args: "clean install -Dmaven.test.skip=true -Ddockerfile.skip -DdockerCompose.skip -Djib.skip" diff --git a/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java b/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java index 6abdd35..ba84101 100644 --- a/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java +++ b/ext/main/java/io/phasetwo/portal/PortalResourceProvider.java @@ -74,7 +74,6 @@ public Object getResource() { } private void setupCors() { - UriInfo uriInfo = session.getContext().getUri(); Cors.builder().allowAllOrigins().allowedMethods(METHODS).auth().add(); }