Skip to content

Commit

Permalink
support version 22
Browse files Browse the repository at this point in the history
  • Loading branch information
cgeorgilakis-grnet committed Nov 2, 2023
1 parent b5a9dea commit 321e1d0
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 49 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
33 changes: 18 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>org.rciam.keycloak</groupId>
<artifactId>keycloak-theme-vanilla</artifactId>
<version>4.1.2</version>
<version>5.0.0</version>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<keycloak.version>18.0.0</keycloak.version>
<infinispan.version>12.1.7.Final</infinispan.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<keycloak.version>22.0.5</keycloak.version>
<infinispan.version>14.0.17.Final</infinispan.version>
</properties>

<organization>
Expand Down Expand Up @@ -49,12 +49,12 @@
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
<artifactId>infinispan-core-jakarta</artifactId>
<version>${infinispan.version}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-commons</artifactId>
<artifactId>infinispan-commons-jakarta</artifactId>
<version>${infinispan.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/theme/rciam/login/login.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<#import "template.ftl" as layout>

<#-- <script src="${url.resourcesCommonPath}/node_modules/jquery/dist/jquery.min.js" type="text/javascript"></script> -->
<script src="${url.resourcesCommonPath}/node_modules/angular/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-rc.3/angular.min.js"></script>


<script>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/theme/rciam/login/template.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#macro registrationLayout bodyClass="" displayInfo=false displayMessage=true displayRequiredFields=false showAnotherWayIfPresent=true>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" class="${properties.kcHtmlClass!}">
<html xmlns="http://www.w3.org/1999/xhtml" class="${properties.kcHtmlClass!}"<#if realm.internationalizationEnabled> lang="${locale.currentLanguageTag}"</#if>>

<head>
<meta charset="utf-8">
Expand Down Expand Up @@ -151,7 +151,7 @@
<script>
var realm = '${realm.name}';
var baseUri = '${uriInfo.baseUri}';
var baseUri = "http://localhost:8080/";
var resourcesCommonPath = '${url.resourcesCommonPath}';
var resourcesPath = '${url.resourcesPath}';
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/theme/rciam/login/theme.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
parent=keycloak
import=common/keycloak

styles=css/login.css css/tile.css css/styles.css
stylesCommon=web_modules/@fortawesome/fontawesome-free/css/icons/all.css web_modules/@patternfly/react-core/dist/styles/base.css web_modules/@patternfly/react-core/dist/styles/app.css node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/pficon/pficon.css
styles=css/login.css css/styles.css
stylesCommon=web_modules/@patternfly/react-core/dist/styles/base.css web_modules/@patternfly/react-core/dist/styles/app.css node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/pficon/pficon.css

kcLogoIdP-orcid= fa fa-extend orcid-logo
kcLogoIdP-6b6b716bef3c495083e31e1a71e8622e07d69b955cc3d9764fe28be5d0e8fb02= fa fa-extend grnet-logo

0 comments on commit 321e1d0

Please sign in to comment.