jakartarized

build.gradle

@@ -1,25 +1,20 @@
-buildscript {
-  ext {
-    springBootVersion = '2.7.4'
-  }
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-	}
+plugins {
+	id 'org.springframework.boot' version '3.1.1'
+	id "io.spring.dependency-management" version "1.1.2"
+	id 'java'
+	id 'war'
+	id 'eclipse'
+	id 'application'
 }
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-apply plugin: 'war'
-apply plugin: 'application'
-
 group = 'de.jottyfan.camporganizer'
-version = '0.5.3'
+version = '0.5.4'
+
+description = """CampOrganizer2"""
+
 sourceCompatibility = 17
+targetCompatibility = 17
+
 mainClassName = "de.jottyfan.camporganizer.Main"
 
 repositories {
@@ -27,16 +22,21 @@ repositories {
 	maven {
 		url "https://www.jottyfan.de/libs/"
 	}
-}
-
-ext {
-  set('keycloakVersion', '21.1.1')
+  maven {
+    url "https://repo.maven.apache.org/maven2"
+  }
 }
 
 war {
-  manifest {
-    attributes("Implementation-Version": version)
+  doFirst {
+    manifest {
+      attributes("Implementation-Title": project.name,
+		             "Implementation-Version": version,
+		             "Implementation-Timestamp": new Date())
+    }
   }
+  baseName = project.name
+  version = version
   archiveName = 'CampOrganizer2.war'
 }
 
@@ -54,11 +54,10 @@ dependencies {
 
   implementation 'net.sf.biweekly:biweekly:0.6.6'
 
-	implementation 'org.keycloak:keycloak-spring-boot-starter'
-
 	// for using the keycloak rest interface
-	implementation 'org.keycloak:keycloak-admin-client:21.1.1'
-	implementation 'org.jboss.resteasy:resteasy-client:5.0.0.Final'
+	implementation 'org.keycloak:keycloak-server-spi:22.0.1'
+	implementation 'org.keycloak:keycloak-admin-client:22.0.0'
+	implementation 'org.jboss.resteasy:resteasy-client:6.2.4.Final'
 
 	// backward compatibility until the complete registration is converted to keycloak
 	implementation 'org.jasypt:jasypt:1.9.3'
@@ -72,19 +71,27 @@ dependencies {
 
 	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-validation'
-	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 	implementation 'de.jottyfan:COJooq:2023.03'
 	implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.0.0'
+
+	implementation 'commons-io:commons-io:2.13.0'
+
 	runtimeOnly 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
 
-dependencyManagement {
-	imports {
-		mavenBom "org.keycloak.bom:keycloak-adapter-bom:${keycloakVersion}"
-	}
+test {
+	useJUnitPlatform()
+}
+
+// add version to manifest
+springBoot {
+  buildInfo()
 }