port to 25 (#149)

* port to 25 * removed build step from release yaml.
p2-inc · Jun 19, 2024 · 392ddc6 · 392ddc6
1 parent 2f2706c
commit 392ddc6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 42 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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,7 @@ 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 +93,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
@@ -26,13 +26,13 @@
   </licenses>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <main.java.package>io.phasetwo.portal</main.java.package>
-    <keycloak.version>24.0.0</keycloak.version>
-    <guava.version>32.0.0-jre</guava.version>
+    <keycloak.version>25.0.0</keycloak.version>
+    <guava.version>33.0.0-jre</guava.version>
     <commons-lang3.version>3.11</commons-lang3.version>
-    <lombok.version>1.18.30</lombok.version>
+    <lombok.version>1.18.32</lombok.version>
     <auto-service.version>1.1.1</auto-service.version>
     <ossrh.url>https://s01.oss.sonatype.org</ossrh.url>
   </properties>
@@ -176,6 +176,11 @@
 	  </execution>
 	</executions>
       </plugin>
+      <plugin> <!-- pretty up the code using google java standards `mvn fmt:format` -->
+        <groupId>com.spotify.fmt</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <version>2.23</version>
+      </plugin>
     </plugins>
     <sourceDirectory>ext/main/java</sourceDirectory>
     <resources>