not yet completed migration to jakarta - still keycloak roles missing

This commit is contained in:
Jörg Henke
2023-07-27 19:35:36 +02:00
parent 059dcadb01
commit f07f8f3c06
33 changed files with 310 additions and 453 deletions

View File

@ -1,19 +1,18 @@
plugins {
id 'org.springframework.boot' version '2.6.5'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'org.springframework.boot' version '3.1.1'
id 'java'
id 'war'
}
group = 'de.jottyfan'
version = '1.2.8'
sourceCompatibility = '11'
apply plugin: 'io.spring.dependency-management'
ext['spring-framework.version'] = '5.3.18'
group = 'de.jottyfan'
version = '1.2.9'
description = """timetrack"""
sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 17
targetCompatibility = 17
repositories {
mavenLocal()
@ -23,12 +22,6 @@ repositories {
// maven { url "https://gitlab.com/jottyfan/libs/-/raw/main" }
}
dependencyManagement {
imports {
mavenBom 'org.keycloak.bom:keycloak-adapter-bom:21.1.1'
}
}
dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.20.0'
implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
@ -46,14 +39,14 @@ dependencies {
implementation 'org.webjars.bowergithub.datatables:datatables:1.10.21'
implementation 'org.keycloak:keycloak-spring-boot-starter:17.0.1'
implementation 'org.springframework.boot:spring-boot-starter-jooq'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
implementation 'org.springframework.security:spring-security-oauth2-authorization-server:1.1.1'
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-test'
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
implementation 'de.jottyfan:timetrackjooq:0.1.1'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.0.0'
@ -64,6 +57,18 @@ dependencies {
testImplementation 'org.springframework.security:spring-security-test'
}
war {
doFirst {
manifest {
attributes("Implementation-Title": project.name,
"Implementation-Version": version,
"Implementation-Timestamp": new Date())
}
}
baseName = project.name
version = version
}
test {
useJUnitPlatform()
}