diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e782ac6..c1c4130 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,10 @@ jobs:
- uses: actions/checkout@v2
- - name: Set up JDK 8
+ - name: Set up JDK 17
uses: actions/setup-java@v2
with:
- java-version: '8'
+ java-version: '17'
distribution: 'adopt'
- name: Build with Maven
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 16d2999..5399bb7 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -12,18 +12,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Set up JDK 8
+ - name: Set up JDK 17
uses: actions/setup-java@v2
with:
- java-version: '8'
+ java-version: '17'
distribution: 'adopt'
- uses: actions/checkout@v2
- - name: Set up JDK 8
+ - name: Set up JDK 17
uses: actions/setup-java@v2
with:
- java-version: '8'
+ java-version: '17'
distribution: 'adopt'
- name: Build with Maven
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e55e5b1..4aca889 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
For Keycloak upstream changelog please see https://www.keycloak.org/docs/latest/release_notes/index.html.
Full Keycloak upstream jira issue can be shown if filtered by Fix version. For example [Keycloak jira issue for 15.0.2 version](https://issues.redhat.com/browse/KEYCLOAK-19161?jql=project%20%3D%20keycloak%20and%20fixVersion%20%3D%2015.0.2)
+## [v5.0.0]
+### Changed
+- Support for Keycloak version 22.0.3 with Java Jakarta 17
+
## [v4.1.2] - 2022-09-27
### Changed
- Increased the AUP width, the WAYF listing width and removed the logo extra padding (RCIAM-1124).
diff --git a/README.md b/README.md
index f0f9339..fb986cd 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,8 @@ This is the vanilla theme for rciam installations.
Please note that this theme needs a custom modification on core keycloak code in order to work.
The [theme releases](https://github.com/rciam/keycloak-theme-vanilla/releases) are compatible with these [keycloak releases](https://github.com/eosc-kc/keycloak/releases), as presented in the compatibility matrix [at the end of this page](https://github.com/rciam/keycloak-theme-vanilla/edit/master/README.md#compatibility-matrix)
-The theme also requires one of the following env variables: { JBOSS_HOME | QUARKUS_HOME | HOME } to store its configuration files.
+**The theme also requires one of the following env variables: { JBOSS_HOME | QUARKUS_HOME | HOME } to store its configuration files - even in development mode.**
+**This is the folder that theme files are stored. Folder can be empty for default configuration.**
Contact the development team for instructions.
@@ -126,24 +127,26 @@ and the keycloak theme will pick up any file instantly (it utilizes file listern
This theme is compatible with the custom releases of keycloak which can be found [here](https://github.com/eosc-kc/keycloak/releases)
-| Theme version | Keycloak version |
-|---------------|-----------------|
+| Theme version | Keycloak version |
+|---------------|--------------------|
| v1.0.0 | v15.0.2-r1.0.(1-4) |
| v1.1.0 | v15.0.2-r1.0.(1-4) |
-| v1.2.0 | v15.0.2-r1.0.5 + |
-| v2.0.0 | v15.0.2-r1.0.6 + |
-| v2.1.0 | v15.0.2-r1.0.6 + |
-| v2.2.0 | v15.0.2-r1.0.6 + |
-| v2.3.0 | v16.1.0-rc1.0.1 + |
-| v3.0.0 | v16.1.0-rc1.0.1 + |
-| v3.0.1 | v16.1.0-rc1.0.1 + |
-| v4.0.0 | v16.1.0-1.0.1 + |
-| v4.0.3 | v16.1.0-1.0.1 + |
-| v4.1.0 | v18.0.0-1.0.1 + |
-| v4.1.1 | v18.0.0-1.0.1 + |
-| v4.1.2 | v18.0.1-2.1 + |
+| v1.2.0 | v15.0.2-r1.0.5 + |
+| v2.0.0 | v15.0.2-r1.0.6 + |
+| v2.1.0 | v15.0.2-r1.0.6 + |
+| v2.2.0 | v15.0.2-r1.0.6 + |
+| v2.3.0 | v16.1.0-rc1.0.1 + |
+| v3.0.0 | v16.1.0-rc1.0.1 + |
+| v3.0.1 | v16.1.0-rc1.0.1 + |
+| v4.0.0 | v16.1.0-1.0.1 + |
+| v4.0.3 | v16.1.0-1.0.1 + |
+| v4.1.0 | v18.0.0-1.0.1 + |
+| v4.1.1 | v18.0.0-1.0.1 + |
+| v4.1.2 | v18.0.1-2.1 + |
+| v5.0.0 | v22.0.5-1.0 + |
If you are using keycloak 16.1.0-X.X.X versions, you **should definitely** use the theme version 4.0.3 which includes a critical fix.
+Version 5.0.0 and upper is based in Keycloak version 22.0.5 . This means use JDK 17 and Jakarta version.
## License
diff --git a/pom.xml b/pom.xml
index d8ab97e..92f743c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
org.rciam.keycloak
keycloak-theme-vanilla
- 4.1.2
+ 5.0.0
jar
- 8
- 8
- 18.0.0
- 12.1.7.Final
+ 17
+ 17
+ 22.0.5
+ 14.0.17.Final
@@ -49,12 +49,12 @@
org.infinispan
- infinispan-core
+ infinispan-core-jakarta
${infinispan.version}
org.infinispan
- infinispan-commons
+ infinispan-commons-jakarta
${infinispan.version}
provided
diff --git a/src/main/java/io/github/rciam/keycloak/rest/ThemeResourceProvider.java b/src/main/java/io/github/rciam/keycloak/rest/ThemeResourceProvider.java
index 74ab717..e6b9ee7 100644
--- a/src/main/java/io/github/rciam/keycloak/rest/ThemeResourceProvider.java
+++ b/src/main/java/io/github/rciam/keycloak/rest/ThemeResourceProvider.java
@@ -46,22 +46,22 @@
import org.keycloak.services.resources.admin.permissions.AdminPermissions;
import org.keycloak.sessions.AuthenticationSessionModel;
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/resources/theme/rciam/login/login.ftl b/src/main/resources/theme/rciam/login/login.ftl
index a029502..870f9d4 100644
--- a/src/main/resources/theme/rciam/login/login.ftl
+++ b/src/main/resources/theme/rciam/login/login.ftl
@@ -1,7 +1,7 @@
<#import "template.ftl" as layout>
<#-- -->
-
+